Rev 4267: (tanner) merge 1.14rc1 back into bzr.dev in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Apr 8 07:22:19 BST 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4267
revision-id: pqm at pqm.ubuntu.com-20090408062211-qhu50uezgnlj7ked
parent: pqm at pqm.ubuntu.com-20090407180335-g11gve6533bv8lei
parent: tanner at real-time.com-20090408033431-draj0u7nd9bbby53
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-04-08 07:22:11 +0100
message:
(tanner) merge 1.14rc1 back into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
bzrlib/tests/test_export.py test_export.py-20090220201010-tpbxssdnezsvu9pk-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 4241.8.9
revision-id: tanner at real-time.com-20090408033431-draj0u7nd9bbby53
parent: tanner at real-time.com-20090407210548-qurg61vrnltn764y
parent: pqm at pqm.ubuntu.com-20090407180335-g11gve6533bv8lei
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: bzr.1.14
timestamp: Tue 2009-04-07 22:34:31 -0500
message:
Merge 1.14rc1 back bzr.dev
added:
bzrlib/inventory_delta.py journalled_inventory-20080103020931-0ht5n40kwc0p7fy1-1
bzrlib/serializer.py serializer.py-20090402143702-wmkh9cfjhwpju0qi-1
bzrlib/tests/bzrdir_implementations/test_push.py test_push.py-20090403142358-xnn0wtsk3gx238ot-1
bzrlib/tests/test_inventory_delta.py test_journalled_inv.-20080103012121-ny2w9slze5jgty8i-1
bzrlib/tests/test_serializer.py test_serializer.py-20090403213933-q6x117y8t9fbeyoz-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/workingtree_implementations/test_read_working_inventory.py test_read_working_in-20061005073432-585uyj0sua6r7i9v-2
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/version_info_formats/format_custom.py format_custom.py-20071029100350-ajovqhbpb5khf6gu-1
bzrlib/version_info_formats/format_python.py format_python.py-20060809202444-ike7i9ub03gb432p-1
bzrlib/version_info_formats/format_rio.py format_rio.py-20060809202444-ike7i9ub03gb432p-2
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20080328030717-t9guwinq8hom0ar3-1
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
doc/developers/incremental-push-pull.txt incrementalpushpull.-20070508045640-zneiu1yzbci574c6-1
doc/developers/inventory.txt inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/developers/merge-scaling.txt mergescaling.rst-20070527173558-rqaqxn1al7vzgcto-2
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
------------------------------------------------------------
revno: 4241.8.8
revision-id: tanner at real-time.com-20090407210548-qurg61vrnltn764y
parent: pqm at pqm.ubuntu.com-20090407222323-wj7suiz9p413eflm
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: bzr.1.14
timestamp: Tue 2009-04-07 16:05:48 -0500
message:
Release 1.14rc1.
------------------------------------------------------------
revno: 4241.8.7
revision-id: pqm at pqm.ubuntu.com-20090407222323-wj7suiz9p413eflm
parent: pqm at pqm.ubuntu.com-20090407204837-l92yzlmcdic3zzbk
parent: tanner at real-time.com-20090407200126-hmq412bjer1iqz00
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.14
timestamp: Tue 2009-04-07 23:23:23 +0100
message:
(tanner) land brisbane-core in safest possible way (Vincent Ladeuil,
Robert Collins)
added:
bzrlib/_chk_map_py.py _chk_map_py.py-20090309114220-1kurz7oez2gwqtcf-1
bzrlib/_chk_map_pyx.pyx _chk_map_pyx.pyx-20090309111231-peyz7p2azr0dzdrb-1
bzrlib/_groupcompress_py.py _groupcompress_py.py-20090324110021-j63s399f4icrgw4p-1
bzrlib/_groupcompress_pyx.pyx _groupcompress_c.pyx-20080724041824-yelg6ii7c7zxt4z0-1
bzrlib/chk_map.py chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
bzrlib/chk_serializer.py chk_serializer.py-20081002064345-2tofdfj2eqq01h4b-1
bzrlib/delta.h delta.h-20090227173129-qsu3u43vowf1q3ay-1
bzrlib/diff-delta.c diffdelta.c-20090226042143-l9wzxynyuxnb5hus-1
bzrlib/groupcompress.py groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/tests/per_repository_chk/ per_repository_chk-20080925061730-e4g24t5xstp2n2vp-1
bzrlib/tests/per_repository_chk/__init__.py __init__.py-20080925061730-e4g24t5xstp2n2vp-2
bzrlib/tests/per_repository_chk/test_supported.py test_supported.py-20080925063728-k65ry0n2rhta6t34-1
bzrlib/tests/per_repository_chk/test_unsupported.py test_unsupported.py-20080925063728-k65ry0n2rhta6t34-2
bzrlib/tests/test__chk_map.py test__chk_map.py-20090309114220-1kurz7oez2gwqtcf-2
bzrlib/tests/test__groupcompress.py test__groupcompress_-20080724145854-koifwb7749cfzrvj-1
bzrlib/tests/test_chk_map.py test_chk_map.py-20081001014447-ue6kkuhofvdecvxa-2
bzrlib/tests/test_groupcompress.py test_groupcompress.p-20080705181503-ccbxd6xuy1bdnrpu-13
doc/developers/groupcompress-design.txt design-20080705181503-ccbxd6xuy1bdnrpu-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_filtered_view_ops.py test_filtered_view_o-20081110012645-5t7ogtola0l33lkg-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_view.py test_view.py-20080731135100-66o8o32heop7augi-1
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/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
bzrlib/tests/per_repository/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 4241.13.3
revision-id: tanner at real-time.com-20090407200126-hmq412bjer1iqz00
parent: tanner at real-time.com-20090407183641-4ngb6jsq9ut2xb03
parent: v.ladeuil+lp at free.fr-20090407141405-x2pxhavzdblgfh37
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: bzr.1.14
timestamp: Tue 2009-04-07 15:01:26 -0500
message:
land brisbane-core in safest possible way (Vincent Ladeuil, Robert Collins)
added:
bzrlib/_chk_map_py.py _chk_map_py.py-20090309114220-1kurz7oez2gwqtcf-1
bzrlib/_chk_map_pyx.pyx _chk_map_pyx.pyx-20090309111231-peyz7p2azr0dzdrb-1
bzrlib/_groupcompress_py.py _groupcompress_py.py-20090324110021-j63s399f4icrgw4p-1
bzrlib/_groupcompress_pyx.pyx _groupcompress_c.pyx-20080724041824-yelg6ii7c7zxt4z0-1
bzrlib/chk_map.py chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
bzrlib/chk_serializer.py chk_serializer.py-20081002064345-2tofdfj2eqq01h4b-1
bzrlib/delta.h delta.h-20090227173129-qsu3u43vowf1q3ay-1
bzrlib/diff-delta.c diffdelta.c-20090226042143-l9wzxynyuxnb5hus-1
bzrlib/groupcompress.py groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/tests/per_repository_chk/ per_repository_chk-20080925061730-e4g24t5xstp2n2vp-1
bzrlib/tests/per_repository_chk/__init__.py __init__.py-20080925061730-e4g24t5xstp2n2vp-2
bzrlib/tests/per_repository_chk/test_supported.py test_supported.py-20080925063728-k65ry0n2rhta6t34-1
bzrlib/tests/per_repository_chk/test_unsupported.py test_unsupported.py-20080925063728-k65ry0n2rhta6t34-2
bzrlib/tests/test__chk_map.py test__chk_map.py-20090309114220-1kurz7oez2gwqtcf-2
bzrlib/tests/test__groupcompress.py test__groupcompress_-20080724145854-koifwb7749cfzrvj-1
bzrlib/tests/test_chk_map.py test_chk_map.py-20081001014447-ue6kkuhofvdecvxa-2
bzrlib/tests/test_groupcompress.py test_groupcompress.p-20080705181503-ccbxd6xuy1bdnrpu-13
doc/developers/groupcompress-design.txt design-20080705181503-ccbxd6xuy1bdnrpu-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_filtered_view_ops.py test_filtered_view_o-20081110012645-5t7ogtola0l33lkg-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_view.py test_view.py-20080731135100-66o8o32heop7augi-1
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/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
bzrlib/tests/per_repository/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 4241.15.16
revision-id: v.ladeuil+lp at free.fr-20090407141405-x2pxhavzdblgfh37
parent: v.ladeuil+lp at free.fr-20090407141257-a42hx8ijhojg6y1z
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 16:14:05 +0200
message:
Fix docs to build. (Robert Collins)
modified:
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
------------------------------------------------------------
revno: 4241.15.15
revision-id: v.ladeuil+lp at free.fr-20090407141257-a42hx8ijhojg6y1z
parent: v.ladeuil+lp at free.fr-20090407140926-vluif16bnia5ern2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 16:12:57 +0200
message:
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil)
added:
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/tests/per_repository_chk/ per_repository_chk-20080925061730-e4g24t5xstp2n2vp-1
bzrlib/tests/per_repository_chk/__init__.py __init__.py-20080925061730-e4g24t5xstp2n2vp-2
bzrlib/tests/per_repository_chk/test_supported.py test_supported.py-20080925063728-k65ry0n2rhta6t34-1
bzrlib/tests/per_repository_chk/test_unsupported.py test_unsupported.py-20080925063728-k65ry0n2rhta6t34-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/chk_serializer.py chk_serializer.py-20081002064345-2tofdfj2eqq01h4b-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_filtered_view_ops.py test_filtered_view_o-20081110012645-5t7ogtola0l33lkg-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_view.py test_view.py-20080731135100-66o8o32heop7augi-1
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_chk_map.py test_chk_map.py-20081001014447-ue6kkuhofvdecvxa-2
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
------------------------------------------------------------
revno: 4241.15.14
revision-id: v.ladeuil+lp at free.fr-20090407140926-vluif16bnia5ern2
parent: v.ladeuil+lp at free.fr-20090407140622-lq7loe2c4e9pshh1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 16:09:26 +0200
message:
Add InterCHKRevisionTree. (Vincent Ladeuil)
modified:
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
------------------------------------------------------------
revno: 4241.15.13
revision-id: v.ladeuil+lp at free.fr-20090407140622-lq7loe2c4e9pshh1
parent: v.ladeuil+lp at free.fr-20090407140013-wpbn6r908f6364na
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 16:06:22 +0200
message:
Groupcompress from brisbane-core (Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil)
added:
bzrlib/_groupcompress_py.py _groupcompress_py.py-20090324110021-j63s399f4icrgw4p-1
bzrlib/_groupcompress_pyx.pyx _groupcompress_c.pyx-20080724041824-yelg6ii7c7zxt4z0-1
bzrlib/delta.h delta.h-20090227173129-qsu3u43vowf1q3ay-1
bzrlib/diff-delta.c diffdelta.c-20090226042143-l9wzxynyuxnb5hus-1
bzrlib/groupcompress.py groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
bzrlib/tests/test__groupcompress.py test__groupcompress_-20080724145854-koifwb7749cfzrvj-1
bzrlib/tests/test_groupcompress.py test_groupcompress.p-20080705181503-ccbxd6xuy1bdnrpu-13
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 4241.15.12
revision-id: v.ladeuil+lp at free.fr-20090407140013-wpbn6r908f6364na
parent: v.ladeuil+lp at free.fr-20090407135600-80l2nagegwnkv4ip
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 16:00:13 +0200
message:
CHKInventory support from brisbane-core. (Robert Collins)
modified:
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
------------------------------------------------------------
revno: 4241.15.11
revision-id: v.ladeuil+lp at free.fr-20090407135600-80l2nagegwnkv4ip
parent: v.ladeuil+lp at free.fr-20090407135317-enkq1rh3hgcblxme
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 15:56:00 +0200
message:
Really build on old pyrex. (Robert Collins)
modified:
bzrlib/_chk_map_pyx.pyx _chk_map_pyx.pyx-20090309111231-peyz7p2azr0dzdrb-1
------------------------------------------------------------
revno: 4241.15.10
revision-id: v.ladeuil+lp at free.fr-20090407135317-enkq1rh3hgcblxme
parent: v.ladeuil+lp at free.fr-20090407135035-pqt8bty4ttcvrlpo
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 15:53:17 +0200
message:
Hopefully fix older pyrex support for chk_map pyrex extension (Robert Collins)
modified:
bzrlib/_chk_map_pyx.pyx _chk_map_pyx.pyx-20090309111231-peyz7p2azr0dzdrb-1
------------------------------------------------------------
revno: 4241.15.9
revision-id: v.ladeuil+lp at free.fr-20090407135035-pqt8bty4ttcvrlpo
parent: v.ladeuil+lp at free.fr-20090407132213-dx667bqxl7i0uj80
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 15:50:35 +0200
message:
chk_map code from brisbane-core (Robert Collins)
added:
bzrlib/_chk_map_py.py _chk_map_py.py-20090309114220-1kurz7oez2gwqtcf-1
bzrlib/_chk_map_pyx.pyx _chk_map_pyx.pyx-20090309111231-peyz7p2azr0dzdrb-1
bzrlib/chk_map.py chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
bzrlib/chk_serializer.py chk_serializer.py-20081002064345-2tofdfj2eqq01h4b-1
bzrlib/tests/test__chk_map.py test__chk_map.py-20090309114220-1kurz7oez2gwqtcf-2
bzrlib/tests/test_chk_map.py test_chk_map.py-20081001014447-ue6kkuhofvdecvxa-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 4241.15.8
revision-id: v.ladeuil+lp at free.fr-20090407132213-dx667bqxl7i0uj80
parent: v.ladeuil+lp at free.fr-20090407130955-6bq00v9dlx2g99lu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 15:22:13 +0200
message:
per_repository/test_repository improvements (Robert Collins)
modified:
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 4241.15.7
revision-id: v.ladeuil+lp at free.fr-20090407130955-6bq00v9dlx2g99lu
parent: v.ladeuil+lp at free.fr-20090407130054-6l3g1btpwfxe46x4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 15:09:55 +0200
message:
Add chk_bytes property to RemoteRepository (Robert Collins)
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 4241.15.6
revision-id: v.ladeuil+lp at free.fr-20090407130054-6l3g1btpwfxe46x4
parent: v.ladeuil+lp at free.fr-20090407125535-aqq6rtbkrfx7rnhb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 15:00:54 +0200
message:
supports_chks flag on repo formats & log tuning (Ian Clatworthy)
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
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
------------------------------------------------------------
revno: 4241.15.5
revision-id: v.ladeuil+lp at free.fr-20090407125535-aqq6rtbkrfx7rnhb
parent: v.ladeuil+lp at free.fr-20090407124750-r0nz9rn4cwnsanya
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 14:55:35 +0200
message:
prepare for CHKInventory in memorytree/mutabletree (Vincent Ladeuil)
modified:
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
------------------------------------------------------------
revno: 4241.15.4
revision-id: v.ladeuil+lp at free.fr-20090407124750-r0nz9rn4cwnsanya
parent: v.ladeuil+lp at free.fr-20090407124050-r231zwugieqcylpu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 14:47:50 +0200
message:
minor test clean-ups & _reconcile_pack API (Robert Collins)
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
bzrlib/tests/per_repository/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
------------------------------------------------------------
revno: 4241.15.3
revision-id: v.ladeuil+lp at free.fr-20090407124050-r231zwugieqcylpu
parent: v.ladeuil+lp at free.fr-20090407123949-uqgjngpnrldov2tx
parent: ian.clatworthy at canonical.com-20090403005329-gd1a2lc61w8pikc0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 14:40:50 +0200
message:
add sha generation support to versioned files (Robert Collins)
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 4241.15.2
revision-id: v.ladeuil+lp at free.fr-20090407123949-uqgjngpnrldov2tx
parent: v.ladeuil+lp at free.fr-20090407121200-vrve18p05ysq0hdh
parent: ian.clatworthy at canonical.com-20090403013458-tcfpm8tfcvjblg87
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 14:39:49 +0200
message:
Groupcompress design doc (Robert Collins)
added:
doc/developers/groupcompress-design.txt design-20080705181503-ccbxd6xuy1bdnrpu-2
modified:
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 4241.15.1
revision-id: v.ladeuil+lp at free.fr-20090407121200-vrve18p05ysq0hdh
parent: pqm at pqm.ubuntu.com-20090406235830-isrefclw112zgeem
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bbc-1.14
timestamp: Tue 2009-04-07 14:12:00 +0200
message:
tree tweaks from brisbane-core (ianc)
modified:
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 4241.8.6
revision-id: pqm at pqm.ubuntu.com-20090407204837-l92yzlmcdic3zzbk
parent: pqm at pqm.ubuntu.com-20090406235830-isrefclw112zgeem
parent: tanner at real-time.com-20090407183641-4ngb6jsq9ut2xb03
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.14
timestamp: Tue 2009-04-07 21:48:37 +0100
message:
Prepare 1.14rc1 (try #3)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 4241.13.2
revision-id: tanner at real-time.com-20090407183641-4ngb6jsq9ut2xb03
parent: tanner at real-time.com-20090407062352-n7poxz6757kuaias
parent: v.ladeuil+lp at free.fr-20090407170102-j5utbh39e3z52oiq
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: bzr.1.14
timestamp: Tue 2009-04-07 13:36:41 -0500
message:
[merge] Fix bug #355454 by casting to unicode (Vincent Ladeuil)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 4241.14.2
revision-id: v.ladeuil+lp at free.fr-20090407170102-j5utbh39e3z52oiq
parent: v.ladeuil+lp at free.fr-20090407152958-xynpccje2tbcmbh4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355454-unicode-warning
timestamp: Tue 2009-04-07 19:01:02 +0200
message:
Fixed as per John's review feedback.
* bzrlib/workingtree_4.py:
(ContentFilterAwareSHA1Provider.sha1,
ContentFilterAwareSHA1Provider.stat_and_sha1): Refers to base
class.
* bzrlib/dirstate.py:
(SHA1Provider.sha1, SHA1Provider.stat_and_sha1): Update doc string.
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 4241.14.1
revision-id: v.ladeuil+lp at free.fr-20090407152958-xynpccje2tbcmbh4
parent: pqm at pqm.ubuntu.com-20090406235830-isrefclw112zgeem
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355454-unicode-warning
timestamp: Tue 2009-04-07 17:29:58 +0200
message:
Fix bug #355454 by casting to unicode.
* bzrlib/workingtree_4.py:
(ContentFilterAwareSHA1Provider.sha1,
ContentFilterAwareSHA1Provider.stat_and_sha1): We may be called
with utf8 paths, yet, we need to provide unicode ones to
tree.relpath.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 4241.13.1
revision-id: tanner at real-time.com-20090407062352-n7poxz6757kuaias
parent: pqm at pqm.ubuntu.com-20090406235830-isrefclw112zgeem
parent: v.ladeuil+lp at free.fr-20090403162715-my5cc8hcwqjqy2xh
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: bzr.1.14
timestamp: Tue 2009-04-07 01:23:52 -0500
message:
[merge] into 1.14 from lp:~vila/bzr/1.14 Fix handling of fallback repositories some more (Vincent Ladeuil)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 4241.12.1
revision-id: v.ladeuil+lp at free.fr-20090403162715-my5cc8hcwqjqy2xh
parent: pqm at pqm.ubuntu.com-20090402163502-ryn8zr2giilw5bki
parent: robertc at robertcollins.net-20090403020831-9hk3udjt5rd32iux
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 1.14
timestamp: Fri 2009-04-03 18:27:15 +0200
message:
Fix handling of fallback repositories some more
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 4241.8.5
revision-id: pqm at pqm.ubuntu.com-20090406235830-isrefclw112zgeem
parent: pqm at pqm.ubuntu.com-20090406230127-4sjisyamdb7dp1lh
parent: tanner at real-time.com-20090406222030-8kyj9oi718irgzjp
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.14
timestamp: Tue 2009-04-07 00:58:30 +0100
message:
(tanner) Prepare 1.14rc1 (Try #2)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4241.11.2
revision-id: tanner at real-time.com-20090406222030-8kyj9oi718irgzjp
parent: tanner at real-time.com-20090406220905-pi6jlywqkucz4ppx
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: bzr.1.14
timestamp: Mon 2009-04-06 17:20:30 -0500
message:
Prepare 1.14rc1 (try #2)
[merge] (vila) Fix OSX test failures (bug # 355273)
[merge] simplify the content filter registration API (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4241.8.4
revision-id: pqm at pqm.ubuntu.com-20090406230127-4sjisyamdb7dp1lh
parent: pqm at pqm.ubuntu.com-20090406211621-bc5q8lg3fr7am12c
parent: tanner at real-time.com-20090406220905-pi6jlywqkucz4ppx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.14
timestamp: Tue 2009-04-07 00:01:27 +0100
message:
(tanner) simplify the content filter registration API (Ian Clatworthy)
modified:
bzrlib/filters/__init__.py __init__.py-20080416080515-mkxl29amuwrf6uir-2
bzrlib/filters/eol.py eol.py-20090327060429-todzdjmqt3bpv5r8-1
bzrlib/tests/test_filters.py test_filters.py-20080417120614-tc3zok0vvvprsc99-1
------------------------------------------------------------
revno: 4241.11.1
revision-id: tanner at real-time.com-20090406220905-pi6jlywqkucz4ppx
parent: pqm at pqm.ubuntu.com-20090406211621-bc5q8lg3fr7am12c
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: bzr.1.14
timestamp: Mon 2009-04-06 17:09:05 -0500
message:
[merge] simplify the content filter registration API (Ian Clatworthy)
modified:
bzrlib/filters/__init__.py __init__.py-20080416080515-mkxl29amuwrf6uir-2
bzrlib/filters/eol.py eol.py-20090327060429-todzdjmqt3bpv5r8-1
bzrlib/tests/test_filters.py test_filters.py-20080417120614-tc3zok0vvvprsc99-1
------------------------------------------------------------
revno: 4241.8.3
revision-id: pqm at pqm.ubuntu.com-20090406211621-bc5q8lg3fr7am12c
parent: pqm at pqm.ubuntu.com-20090406202453-1g3irlmuiszxrn1b
parent: v.ladeuil+lp at free.fr-20090406200541-rsc4uwvehl81i62h
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.14
timestamp: Mon 2009-04-06 22:16:21 +0100
message:
(vila) Fix OSX test failures (bug # 355273)
------------------------------------------------------------
revno: 4241.9.7
revision-id: v.ladeuil+lp at free.fr-20090406200541-rsc4uwvehl81i62h
parent: v.ladeuil+lp at free.fr-20090406141833-cboy3q70jn1xhfad
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355273-osx-failures
timestamp: Mon 2009-04-06 22:05:41 +0200
message:
Fix OSX test failures (bug # 355273)
------------------------------------------------------------
revno: 4241.8.2
revision-id: pqm at pqm.ubuntu.com-20090406202453-1g3irlmuiszxrn1b
parent: pqm at pqm.ubuntu.com-20090404083227-21wujn0vqw70pobm
parent: tanner at real-time.com-20090406174233-o8sljlu3yt5lbxvp
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.14
timestamp: Mon 2009-04-06 21:24:53 +0100
message:
(tanner) Fix OSX test failures Bug 355273 (vila)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
bzrlib/tests/test_export.py test_export.py-20090220201010-tpbxssdnezsvu9pk-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 4241.10.1
revision-id: tanner at real-time.com-20090406174233-o8sljlu3yt5lbxvp
parent: pqm at pqm.ubuntu.com-20090404083227-21wujn0vqw70pobm
parent: v.ladeuil+lp at free.fr-20090406141833-cboy3q70jn1xhfad
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: bzr.1.14
timestamp: Mon 2009-04-06 12:42:33 -0500
message:
(tanner) Fix bug 355273 selftest failures on MacOS X (vila). Thanks Brian de Alwis.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
bzrlib/tests/test_export.py test_export.py-20090220201010-tpbxssdnezsvu9pk-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 4241.9.6
revision-id: v.ladeuil+lp at free.fr-20090406141833-cboy3q70jn1xhfad
parent: v.ladeuil+lp at free.fr-20090406140116-zkbvjtaxfhbql4l4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355273-osx-failures
timestamp: Mon 2009-04-06 16:18:33 +0200
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
------------------------------------------------------------
revno: 4241.9.5
revision-id: v.ladeuil+lp at free.fr-20090406140116-zkbvjtaxfhbql4l4
parent: v.ladeuil+lp at free.fr-20090406114140-198qzpk26q3ll8or
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355273-osx-failures
timestamp: Mon 2009-04-06 16:01:16 +0200
message:
Fix unicode related OSX failures.
* bzrlib/tests/test_export.py:
Fix imports.
* bzrlib/tests/blackbox/test_export.py:
(TestExport.test_tar_export_unicode,
TestExport.test_zip_export_unicode): Use a less problematic
unicode char for OSX.
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/test_export.py test_export.py-20090220201010-tpbxssdnezsvu9pk-1
------------------------------------------------------------
revno: 4241.9.4
revision-id: v.ladeuil+lp at free.fr-20090406114140-198qzpk26q3ll8or
parent: v.ladeuil+lp at free.fr-20090406095410-h4hq18kc8xsjycxl
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355273-osx-failures
timestamp: Mon 2009-04-06 13:41:40 +0200
message:
Fix test_case_insensitive_build_tree_inventory failure on OSX.
* bzrlib/tests/test_transform.py:
(TestBuildTree.test_case_insensitive_build_tree_inventory): This
should have fail earlier, but it fails only since
bzr.dev at 4216 (with _cicp_canonical_relpath activated for
OSX). Anyway, this test requires a true case sensitive file
system.
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 4241.9.3
revision-id: v.ladeuil+lp at free.fr-20090406095410-h4hq18kc8xsjycxl
parent: v.ladeuil+lp at free.fr-20090406081753-7kgr5pcn218zavf4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355273-osx-failures
timestamp: Mon 2009-04-06 11:54:10 +0200
message:
Fix two more test failures specific to OSX.
* bzrlib/tests/test_osutils.py:
Fix imports.
(TestCanonicalRelPath.test_canonical_relpath_simple,
TestCanonicalRelPath.test_canonical_relpath_missing_tail): Fix the
base directory used as OSX redirects /tmp.
modified:
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 4241.9.2
revision-id: v.ladeuil+lp at free.fr-20090406081753-7kgr5pcn218zavf4
parent: v.ladeuil+lp at free.fr-20090406073102-l91dnnz52sjh80df
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355273-osx-failures
timestamp: Mon 2009-04-06 10:17:53 +0200
message:
Fix most of cicp related failures on OSX.
* bzrlib/tests/blackbox/test_filesystem_cicp.py:
Fix forgotten s/added/adding/.
* bzrlib/osutils.py:
(_cicp_canonical_relpath): Should be used for Darwin too according
to tests.CaseInsCasePresFilenameFeature.
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
------------------------------------------------------------
revno: 4241.9.1
revision-id: v.ladeuil+lp at free.fr-20090406073102-l91dnnz52sjh80df
parent: pqm at pqm.ubuntu.com-20090404083227-21wujn0vqw70pobm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355273-osx-failures
timestamp: Mon 2009-04-06 09:31:02 +0200
message:
Fix test_tar_export erroring test.
* bzrlib/tests/blackbox/test_export.py:
Fix bogus import.
modified:
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
------------------------------------------------------------
revno: 4241.8.1
revision-id: pqm at pqm.ubuntu.com-20090404083227-21wujn0vqw70pobm
parent: pqm at pqm.ubuntu.com-20090402163502-ryn8zr2giilw5bki
parent: tanner at real-time.com-20090404070744-0qaj2on4agzwq8ob
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.14
timestamp: Sat 2009-04-04 09:32:27 +0100
message:
Prepare 1.14rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 4241.7.1
revision-id: tanner at real-time.com-20090404070744-0qaj2on4agzwq8ob
parent: pqm at pqm.ubuntu.com-20090402163502-ryn8zr2giilw5bki
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: prepare-1.14rc1
timestamp: Sat 2009-04-04 02:07:44 -0500
message:
Release 1.14rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS 2009-04-07 14:49:24 +0000
+++ b/NEWS 2009-04-08 03:34:31 +0000
@@ -6,8 +6,15 @@
.. contents:: List of Releases
:depth: 1
-In Development
-##############
+bzr 1.14rc1
+###########
+:Codename: brisbane-core
+:1.14rc1: 2009-04-06
+
+New formats 1.14 and 1.14-rich-root supporting End-Of-Line (EOL) conversions,
+keyword templating (via the bzr-keywords plugin) and generic content filtering.
+End-of-line conversion is now supported for formats supporting content
+filtering.
Compatibility Breaks
********************
@@ -156,6 +163,9 @@
* Fixed incorrect "Source format does not support stacking" warning
when pushing to a smart server. (Andrew Bennetts, #334114)
+* Fix 'make check-dist-tarball' failure by converting paths to unicode when
+ needed. (Vincent Ladeuil, #355454)
+
* Fixed "Specified file 'x/y/z' is outside current view: " occurring
on ``bzr add x/y/z`` in formats supporting views when no view is
defined. (Ian Clatworthy, #344708)
@@ -176,6 +186,9 @@
both branches, we know that the trunk for the project can be read too,
so the upgrade will not inconvenience users. (Robert Collins, #345169)
+* The full test suite is passing again on OSX. Several minor issues (mostly
+ test related) have been fixed. (Vincent Ladeuil, #355273).
+
* The GNU Changelog formatter is slightly improved in the case where
the delta is empty, and now correctly claims not to support tags.
(Andrea Bolognani)
@@ -267,6 +280,9 @@
Internals
*********
+* Added ``chk_map`` for fast, trie-based storage of tuple to string maps.
+ (Robert Collins, John Arbash Meinel, Vincent Ladeuil)
+
* Added ``bzrlib.chk_map`` for fast, trie-based storage of tuple to string
maps. (Robert Collins, John Arbash Meinel, Vincent Ladeuil)
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2009-03-27 06:12:14 +0000
+++ b/bzrlib/__init__.py 2009-04-04 07:07:44 +0000
@@ -50,7 +50,7 @@
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
# releaselevel of 'dev' for unreleased under-development code.
-version_info = (1, 14, 0, 'dev', 0)
+version_info = (1, 14, 0, 'candidate', 1)
# API compatibility version: bzrlib is currently API compatible with 1.13.
api_minimum_version = (1, 13, 0)
=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py 2009-04-04 02:50:01 +0000
+++ b/bzrlib/dirstate.py 2009-04-08 03:34:31 +0000
@@ -267,12 +267,19 @@
"""An interface for getting sha1s of a file."""
def sha1(self, abspath):
- """Return the sha1 of a file given its absolute path."""
+ """Return the sha1 of a file given its absolute path.
+
+ :param abspath: May be a filesystem encoded absolute path
+ or a unicode path.
+ """
raise NotImplementedError(self.sha1)
def stat_and_sha1(self, abspath):
"""Return the stat and sha1 of a file given its absolute path.
+ :param abspath: May be a filesystem encoded absolute path
+ or a unicode path.
+
Note: the stat should be the stat of the physical file
while the sha may be the sha of its canonical content.
"""
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py 2009-03-25 21:54:20 +0000
+++ b/bzrlib/osutils.py 2009-04-06 14:01:16 +0000
@@ -1030,10 +1030,11 @@
return current[len(abs_base)+1:]
# XXX - TODO - we need better detection/integration of case-insensitive
-# file-systems; Linux often sees FAT32 devices, for example, so could
-# probably benefit from the same basic support there. For now though, only
-# Windows gets that support, and it gets it for *all* file-systems!
-if sys.platform == "win32":
+# file-systems; Linux often sees FAT32 devices (or NFS-mounted OSX
+# filesystems), for example, so could probably benefit from the same basic
+# support there. For now though, only Windows and OSX get that support, and
+# they get it for *all* file-systems!
+if sys.platform in ('win32', 'darwin'):
canonical_relpath = _cicp_canonical_relpath
else:
canonical_relpath = relpath
=== modified file 'bzrlib/tests/blackbox/test_export.py'
--- a/bzrlib/tests/blackbox/test_export.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_export.py 2009-04-06 14:18:33 +0000
@@ -25,10 +25,11 @@
import tarfile
import zipfile
-from bzrlib.export import (
- zip_exporter,
+
+from bzrlib import (
+ export,
+ tests,
)
-from bzrlib.tests import TestSkipped
from bzrlib.tests.blackbox import ExternalBase
@@ -66,11 +67,14 @@
def test_tar_export_unicode(self):
tree = self.make_branch_and_tree('tar')
- fname = u'\xe5.txt'
+ # FIXME: using fname = u'\xe5.txt' below triggers a bug revealed since
+ # bzr.dev revno 4216 but more related to OSX/working trees/unicode than
+ # export itself --vila 20090406
+ fname = u'\N{Euro Sign}.txt'
try:
self.build_tree(['tar/' + fname])
except UnicodeError:
- raise TestSkipped('Unable to represent path %r' % (fname,))
+ raise tests.TestSkipped('Unable to represent path %r' % (fname,))
tree.add([fname])
tree.commit('first')
@@ -107,11 +111,11 @@
def test_zip_export_unicode(self):
tree = self.make_branch_and_tree('zip')
- fname = u'\xe5.txt'
+ fname = u'\N{Euro Sign}.txt'
try:
self.build_tree(['zip/' + fname])
except UnicodeError:
- raise TestSkipped('Unable to represent path %r' % (fname,))
+ raise tests.TestSkipped('Unable to represent path %r' % (fname,))
tree.add([fname])
tree.commit('first')
@@ -138,7 +142,7 @@
self.assertEqual(['test/a', 'test/b/', 'test/b/c', 'test/d/'], names)
file_attr = stat.S_IFREG
- dir_attr = stat.S_IFDIR | zip_exporter.ZIP_DIRECTORY_BIT
+ dir_attr = stat.S_IFDIR | export.zip_exporter.ZIP_DIRECTORY_BIT
a_info = zfile.getinfo(names[0])
self.assertEqual(file_attr, a_info.external_attr)
=== modified file 'bzrlib/tests/blackbox/test_filesystem_cicp.py'
--- a/bzrlib/tests/blackbox/test_filesystem_cicp.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_filesystem_cicp.py 2009-04-06 08:17:53 +0000
@@ -52,13 +52,14 @@
class TestAdd(TestCICPBase):
+
def test_add_simple(self):
"""Test add always uses the case of the filename reported by the os."""
wt = self.make_branch_and_tree('.')
# create a file on disk with the mixed-case name
self.build_tree(['CamelCase'])
- self.check_output('added CamelCase\n', 'add camelcase')
+ self.check_output('adding CamelCase\n', 'add camelcase')
def test_add_subdir(self):
"""test_add_simple but with subdirectories tested too."""
@@ -66,7 +67,8 @@
# create a file on disk with the mixed-case parent and base name
self.build_tree(['CamelCaseParent/', 'CamelCaseParent/CamelCase'])
- self.check_output('added CamelCaseParent\nadded CamelCaseParent/CamelCase\n',
+ self.check_output('adding CamelCaseParent\n'
+ 'adding CamelCaseParent/CamelCase\n',
'add camelcaseparent/camelcase')
def test_add_implied(self):
@@ -75,7 +77,8 @@
# create a file on disk with the mixed-case parent and base name
self.build_tree(['CamelCaseParent/', 'CamelCaseParent/CamelCase'])
- self.check_output('added CamelCaseParent\nadded CamelCaseParent/CamelCase\n',
+ self.check_output('adding CamelCaseParent\n'
+ 'adding CamelCaseParent/CamelCase\n',
'add')
def test_re_add(self):
@@ -84,7 +87,7 @@
wt = self.make_branch_and_tree('.')
# create a file on disk with the mixed-case name
self.build_tree(['MixedCase'])
- self.check_output('added MixedCase\n', 'add MixedCase')
+ self.check_output('adding MixedCase\n', 'add MixedCase')
# 'accidently' rename the file on disk
os.rename('MixedCase', 'mixedcase')
self.check_empty_output('add mixedcase')
@@ -96,7 +99,8 @@
wt = self.make_branch_and_tree('.')
# create a file on disk with the mixed-case name
self.build_tree(['MixedCaseParent/', 'MixedCaseParent/MixedCase'])
- self.check_output('added MixedCaseParent\nadded MixedCaseParent/MixedCase\n',
+ self.check_output('adding MixedCaseParent\n'
+ 'adding MixedCaseParent/MixedCase\n',
'add MixedCaseParent')
# 'accidently' rename the directory on disk
os.rename('MixedCaseParent', 'mixedcaseparent')
@@ -118,8 +122,9 @@
self.run_bzr('add')
self.run_bzr('ci -m message')
- self.check_output('CamelCaseParent/CamelCase => CamelCaseParent/NewCamelCase\n',
- 'mv camelcaseparent/camelcase camelcaseparent/NewCamelCase')
+ self.check_output(
+ 'CamelCaseParent/CamelCase => CamelCaseParent/NewCamelCase\n',
+ 'mv camelcaseparent/camelcase camelcaseparent/NewCamelCase')
def test_mv_newname_after(self):
wt = self._make_mixed_case_tree()
@@ -129,8 +134,9 @@
# In this case we can specify the incorrect case for the destination,
# as we use --after, so the file-system is sniffed.
- self.check_output('CamelCaseParent/CamelCase => CamelCaseParent/NewCamelCase\n',
- 'mv --after camelcaseparent/camelcase camelcaseparent/newcamelcase')
+ self.check_output(
+ 'CamelCaseParent/CamelCase => CamelCaseParent/NewCamelCase\n',
+ 'mv --after camelcaseparent/camelcase camelcaseparent/newcamelcase')
def test_mv_newname_exists(self):
# test a mv, but when the target already exists with a name that
=== modified file 'bzrlib/tests/test_export.py'
--- a/bzrlib/tests/test_export.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/test_export.py 2009-04-06 14:01:16 +0000
@@ -16,17 +16,21 @@
import os
-from bzrlib.export import export
-from bzrlib.tests import TestCaseWithTransport
-
-
-class TestExport(TestCaseWithTransport):
+
+from bzrlib import (
+ export,
+ tests,
+ )
+
+
+class TestExport(tests.TestCaseWithTransport):
def test_dir_export_missing_file(self):
self.build_tree(['a/', 'a/b', 'a/c'])
wt = self.make_branch_and_tree('.')
wt.add(['a', 'a/b', 'a/c'])
os.unlink('a/c')
- export(wt, 'target', format="dir")
+ export.export(wt, 'target', format="dir")
self.failUnlessExists('target/a/b')
self.failIfExists('target/a/c')
+
=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py 2009-03-24 05:12:24 +0000
+++ b/bzrlib/tests/test_osutils.py 2009-04-06 09:54:10 +0000
@@ -33,11 +33,6 @@
)
from bzrlib.errors import BzrBadParameterNotUnicode, InvalidURL
from bzrlib.osutils import (
- is_inside_any,
- is_inside_or_parent_of_any,
- pathjoin,
- pumpfile,
- pump_string_file,
canonical_relpath,
)
from bzrlib.tests import (
@@ -151,15 +146,15 @@
self.assertTrue(is_inside('', 'foo.c'))
def test_is_inside_any(self):
- SRC_FOO_C = pathjoin('src', 'foo.c')
+ SRC_FOO_C = osutils.pathjoin('src', 'foo.c')
for dirs, fn in [(['src', 'doc'], SRC_FOO_C),
(['src'], SRC_FOO_C),
(['src'], 'src'),
]:
- self.assert_(is_inside_any(dirs, fn))
+ self.assert_(osutils.is_inside_any(dirs, fn))
for dirs, fn in [(['src'], 'srccontrol'),
(['src'], 'srccontrol/foo')]:
- self.assertFalse(is_inside_any(dirs, fn))
+ self.assertFalse(osutils.is_inside_any(dirs, fn))
def test_is_inside_or_parent_of_any(self):
for dirs, fn in [(['src', 'doc'], 'src/foo.c'),
@@ -168,12 +163,12 @@
(['src/bar.c', 'bla/foo.c'], 'src'),
(['src'], 'src'),
]:
- self.assert_(is_inside_or_parent_of_any(dirs, fn))
+ self.assert_(osutils.is_inside_or_parent_of_any(dirs, fn))
for dirs, fn in [(['src'], 'srccontrol'),
(['srccontrol/foo.c'], 'src'),
(['src'], 'srccontrol/foo')]:
- self.assertFalse(is_inside_or_parent_of_any(dirs, fn))
+ self.assertFalse(osutils.is_inside_or_parent_of_any(dirs, fn))
def test_rmtree(self):
# Check to remove tree with read-only files/dirs
@@ -363,15 +358,18 @@
def test_canonical_relpath_simple(self):
f = file('MixedCaseName', 'w')
f.close()
- self.failUnlessEqual(
- canonical_relpath(self.test_base_dir, 'mixedcasename'),
- 'work/MixedCaseName')
+ # Watch out for tricky test dir (on OSX /tmp -> /private/tmp)
+ real_base_dir = osutils.realpath(self.test_base_dir)
+ actual = osutils.canonical_relpath(real_base_dir, 'mixedcasename')
+ self.failUnlessEqual('work/MixedCaseName', actual)
def test_canonical_relpath_missing_tail(self):
os.mkdir('MixedCaseParent')
- self.failUnlessEqual(
- canonical_relpath(self.test_base_dir, 'mixedcaseparent/nochild'),
- 'work/MixedCaseParent/nochild')
+ # Watch out for tricky test dir (on OSX /tmp -> /private/tmp)
+ real_base_dir = osutils.realpath(self.test_base_dir)
+ actual = osutils.canonical_relpath(real_base_dir,
+ 'mixedcaseparent/nochild')
+ self.failUnlessEqual('work/MixedCaseParent/nochild', actual)
class TestPumpFile(TestCase):
@@ -395,27 +393,27 @@
# read (max / 2) bytes and verify read size wasn't affected
num_bytes_to_read = self.block_size / 2
- pumpfile(from_file, to_file, num_bytes_to_read, self.block_size)
+ osutils.pumpfile(from_file, to_file, num_bytes_to_read, self.block_size)
self.assertEqual(from_file.get_max_read_size(), num_bytes_to_read)
self.assertEqual(from_file.get_read_count(), 1)
# read (max) bytes and verify read size wasn't affected
num_bytes_to_read = self.block_size
from_file.reset_read_count()
- pumpfile(from_file, to_file, num_bytes_to_read, self.block_size)
+ osutils.pumpfile(from_file, to_file, num_bytes_to_read, self.block_size)
self.assertEqual(from_file.get_max_read_size(), num_bytes_to_read)
self.assertEqual(from_file.get_read_count(), 1)
# read (max + 1) bytes and verify read size was limited
num_bytes_to_read = self.block_size + 1
from_file.reset_read_count()
- pumpfile(from_file, to_file, num_bytes_to_read, self.block_size)
+ osutils.pumpfile(from_file, to_file, num_bytes_to_read, self.block_size)
self.assertEqual(from_file.get_max_read_size(), self.block_size)
self.assertEqual(from_file.get_read_count(), 2)
# finish reading the rest of the data
num_bytes_to_read = self.test_data_len - to_file.tell()
- pumpfile(from_file, to_file, num_bytes_to_read, self.block_size)
+ osutils.pumpfile(from_file, to_file, num_bytes_to_read, self.block_size)
# report error if the data wasn't equal (we only report the size due
# to the length of the data)
@@ -433,7 +431,8 @@
# retrieve data in blocks
from_file = FakeReadFile(self.test_data)
to_file = StringIO()
- pumpfile(from_file, to_file, self.test_data_len, self.block_size)
+ osutils.pumpfile(from_file, to_file, self.test_data_len,
+ self.block_size)
# verify read size was equal to the maximum read size
self.assertTrue(from_file.get_max_read_size() > 0)
@@ -456,7 +455,7 @@
# retrieve data to EOF
from_file = FakeReadFile(self.test_data)
to_file = StringIO()
- pumpfile(from_file, to_file, -1, self.block_size)
+ osutils.pumpfile(from_file, to_file, -1, self.block_size)
# verify read size was equal to the maximum read size
self.assertEqual(from_file.get_max_read_size(), self.block_size)
@@ -476,7 +475,7 @@
# retrieve data using default (old) pumpfile method
from_file = FakeReadFile(self.test_data)
to_file = StringIO()
- pumpfile(from_file, to_file)
+ osutils.pumpfile(from_file, to_file)
# report error if the data wasn't equal (we only report the size due
# to the length of the data)
@@ -491,16 +490,16 @@
activity.append((length, direction))
from_file = StringIO(self.test_data)
to_file = StringIO()
- pumpfile(from_file, to_file, buff_size=500,
- report_activity=log_activity, direction='read')
+ osutils.pumpfile(from_file, to_file, buff_size=500,
+ report_activity=log_activity, direction='read')
self.assertEqual([(500, 'read'), (500, 'read'), (500, 'read'),
(36, 'read')], activity)
from_file = StringIO(self.test_data)
to_file = StringIO()
del activity[:]
- pumpfile(from_file, to_file, buff_size=500,
- report_activity=log_activity, direction='write')
+ osutils.pumpfile(from_file, to_file, buff_size=500,
+ report_activity=log_activity, direction='write')
self.assertEqual([(500, 'write'), (500, 'write'), (500, 'write'),
(36, 'write')], activity)
@@ -508,8 +507,8 @@
from_file = StringIO(self.test_data)
to_file = StringIO()
del activity[:]
- pumpfile(from_file, to_file, buff_size=500, read_length=1028,
- report_activity=log_activity, direction='read')
+ osutils.pumpfile(from_file, to_file, buff_size=500, read_length=1028,
+ report_activity=log_activity, direction='read')
self.assertEqual([(500, 'read'), (500, 'read'), (28, 'read')], activity)
@@ -518,22 +517,22 @@
def test_empty(self):
output = StringIO()
- pump_string_file("", output)
+ osutils.pump_string_file("", output)
self.assertEqual("", output.getvalue())
def test_more_than_segment_size(self):
output = StringIO()
- pump_string_file("123456789", output, 2)
+ osutils.pump_string_file("123456789", output, 2)
self.assertEqual("123456789", output.getvalue())
def test_segment_size(self):
output = StringIO()
- pump_string_file("12", output, 2)
+ osutils.pump_string_file("12", output, 2)
self.assertEqual("12", output.getvalue())
def test_segment_size_multiple(self):
output = StringIO()
- pump_string_file("1234", output, 2)
+ osutils.pump_string_file("1234", output, 2)
self.assertEqual("1234", output.getvalue())
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/test_transform.py 2009-04-06 11:41:40 +0000
@@ -1841,6 +1841,9 @@
self.assertTrue(source.is_executable('file1-id'))
def test_case_insensitive_build_tree_inventory(self):
+ if (not tests.CaseInsensitiveFilesystemFeature.available()
+ or not tests.CaseInsCasePresFilenameFeature.available()):
+ raise tests.UnavailableFeature('Fully case sensitive filesystem')
source = self.make_branch_and_tree('source')
self.build_tree(['source/file', 'source/FILE'])
source.add(['file', 'FILE'], ['lower-id', 'upper-id'])
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2009-04-03 01:24:32 +0000
+++ b/bzrlib/workingtree_4.py 2009-04-08 03:34:31 +0000
@@ -1301,13 +1301,15 @@
self.tree = tree
def sha1(self, abspath):
- """Return the sha1 of a file given its absolute path."""
- filters = self.tree._content_filter_stack(self.tree.relpath(abspath))
+ """See dirstate.SHA1Provider.sha1()."""
+ filters = self.tree._content_filter_stack(
+ self.tree.relpath(osutils.safe_unicode(abspath)))
return internal_size_sha_file_byname(abspath, filters)[1]
def stat_and_sha1(self, abspath):
- """Return the stat and sha1 of a file given its absolute path."""
- filters = self.tree._content_filter_stack(self.tree.relpath(abspath))
+ """See dirstate.SHA1Provider.stat_and_sha1()."""
+ filters = self.tree._content_filter_stack(
+ self.tree.relpath(osutils.safe_unicode(abspath)))
file_obj = file(abspath, 'rb', 65000)
try:
statvalue = os.fstat(file_obj.fileno())
More information about the bazaar-commits
mailing list