Rev 4124: Merge 1.13 back to trunk, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Mar 12 05:21:07 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4124
revision-id: pqm at pqm.ubuntu.com-20090312052102-ksjfiyd5ctzibuo1
parent: pqm at pqm.ubuntu.com-20090312033910-9umj7rwjo98zl7up
parent: james.westby at canonical.com-20090312030359-ishfh5p46t2isl1n
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-03-12 05:21:02 +0000
message:
Merge 1.13 back to trunk,
and move new things in bzr.dev to top of NEWS.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 4108.1.3
revision-id: james.westby at canonical.com-20090312030359-ishfh5p46t2isl1n
parent: james.westby at canonical.com-20090311003033-z9w8x8bz8uw2b4vg
parent: james.westby at canonical.com-20090312030241-8owjma3iw40a8ulv
committer: James Westby <james.westby at canonical.com>
branch nick: jamesw-integration
timestamp: Thu 2009-03-12 13:03:59 +1000
message:
Merge 1.13 back to trunk, and move new things in bzr.dev to top of NEWS.
added:
bzrlib/tests/per_repository_reference/test_default_stacking.py test_default_stackin-20090311055345-9ajahgm58oq3wh6h-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/tests/workingtree_implementations/test_mkdir.py test_mkdir.py-20060907214856-4omn6hf1u7fvrart-3
bzrlib/tests/workingtree_implementations/test_nested_specifics.py test_nested_specific-20070306004443-qut978c488jr11sg-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 4119.2.1
revision-id: james.westby at canonical.com-20090312030241-8owjma3iw40a8ulv
parent: pqm at pqm.ubuntu.com-20090312001649-6tvc2mmeyw992st3
parent: pqm at pqm.ubuntu.com-20090311094306-qdrxqed2k7sgxf7z
committer: James Westby <james.westby at canonical.com>
branch nick: bzr.dev
timestamp: Thu 2009-03-12 13:02:41 +1000
message:
Merge 1.13 back to trunk, and move new things in bzr.dev to top of NEWS.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 4104.1.3
revision-id: pqm at pqm.ubuntu.com-20090311094306-qdrxqed2k7sgxf7z
parent: pqm at pqm.ubuntu.com-20090311090430-8426u343at5rybh7
parent: james.westby at canonical.com-20090311074032-vsthjcseonry87no
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.13
timestamp: Wed 2009-03-11 09:43:06 +0000
message:
(spiv) Fix bogus 'Source format does not support stacking' warning
when pushing to smart server
added:
bzrlib/tests/per_repository_reference/test_default_stacking.py test_default_stackin-20090311055345-9ajahgm58oq3wh6h-1
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 4104.3.1
revision-id: james.westby at canonical.com-20090311074032-vsthjcseonry87no
parent: pqm at pqm.ubuntu.com-20090310082520-a0kti4ai3djv9va2
parent: andrew.bennetts at canonical.com-20090311065016-3dcl01o0pptwvtrk
committer: James Westby <james.westby at canonical.com>
branch nick: release-1.13
timestamp: Wed 2009-03-11 17:40:32 +1000
message:
Fix bogus 'Source format does not support stacking' warning when pushing to smart server
added:
bzrlib/tests/per_repository_reference/test_default_stacking.py test_default_stackin-20090311055345-9ajahgm58oq3wh6h-1
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 4104.1.2
revision-id: pqm at pqm.ubuntu.com-20090311090430-8426u343at5rybh7
parent: pqm at pqm.ubuntu.com-20090310082520-a0kti4ai3djv9va2
parent: v.ladeuil+lp at free.fr-20090311004656-j9t8d09fd2t39xj3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.13
timestamp: Wed 2009-03-11 09:04:30 +0000
message:
(vila) Fix non ascii symlink handling
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 4104.2.1
revision-id: v.ladeuil+lp at free.fr-20090311004656-j9t8d09fd2t39xj3
parent: pqm at pqm.ubuntu.com-20090310082520-a0kti4ai3djv9va2
parent: v.ladeuil+lp at free.fr-20090310233935-i2tksn5trpni6lgx
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 1.13
timestamp: Wed 2009-03-11 10:46:56 +1000
message:
Fix non ascii symlink handling
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 4095.3.3
revision-id: v.ladeuil+lp at free.fr-20090310233935-i2tksn5trpni6lgx
parent: v.ladeuil+lp at free.fr-20090310085511-joozej1lh8wgiro3
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 339055-symlink
timestamp: Wed 2009-03-11 09:39:35 +1000
message:
Fixed as per John's review.
* bzrlib/dirstate.py:
(DirState._read_link): Not all file systems are UTF-8, so we must
re-encode the symlink target in theses cases.
(DirState._inv_entry_to_details): The symlink target can
transiently be None.
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
------------------------------------------------------------
revno: 4095.3.2
revision-id: v.ladeuil+lp at free.fr-20090310085511-joozej1lh8wgiro3
parent: v.ladeuil+lp at free.fr-20090309163231-hz2n504bgpxf1lde
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 339055-symlink
timestamp: Tue 2009-03-10 18:55:11 +1000
message:
Better fix covering more code paths.
* NEWS:
Fix bug number (272444 not 277444).
* bzrlib/dirstate.py:
(DirState._read_link): All code paths should be covered and some
code paths will produce unicode paths some will produce already fs
encoded paths.
(ProcessEntryPython.iter_changes): Fix typo.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
------------------------------------------------------------
revno: 4095.3.1
revision-id: v.ladeuil+lp at free.fr-20090309163231-hz2n504bgpxf1lde
parent: pqm at pqm.ubuntu.com-20090309052557-ao3zck4ogpqtvvgt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 339055-symlink
timestamp: Tue 2009-03-10 02:32:31 +1000
message:
Fix #339055 and #277444 by handling non ascii symlink targets.
* bzrlib/tests/tree_implementations/test_path_content_summary.py:
(TestPathContentSummary.test_unicode_symlink_target_summary): Test
adding a non ascii symlink target.
* bzrlib/tests/workingtree_implementations/test_parents.py:
(TestSetParents.test_unicode_symlink): Should not fail anymore
* bzrlib/tests/branch_implementations/test_sprout.py:
(TestSprout.test_sprout_with_unicode_symlink): Should not fail anymore.
* bzrlib/workingtree.py:
(WorkingTree.path_content_summary): Get the symlink target as
unicode.
* bzrlib/transform.py:
(_PreviewTree.path_content_summary): Get the symlink target as
unicode.
* bzrlib/dirstate.py:
(DirState._read_link): abspath should stay in Unicode.
(DirState._inv_entry_to_details): Encode path in utf8 for the
fingerprint.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 4104.1.1
revision-id: pqm at pqm.ubuntu.com-20090310082520-a0kti4ai3djv9va2
parent: pqm at pqm.ubuntu.com-20090310060738-6js2ofvx7q1gfg63
parent: tanner at real-time.com-20090309093413-hy5fncy2gypt3ys2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.13
timestamp: Tue 2009-03-10 08:25:20 +0000
message:
Release 1.13rc1.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 4087.1.6
revision-id: tanner at real-time.com-20090309093413-hy5fncy2gypt3ys2
parent: tanner at real-time.com-20090309092418-dno1iwhmcccvjoh2
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: prepare-1.13
timestamp: Mon 2009-03-09 04:34:13 -0500
message:
Release 0.13.rc1.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4087.1.5
revision-id: tanner at real-time.com-20090309092418-dno1iwhmcccvjoh2
parent: tanner at real-time.com-20090309021608-p6c9twfqu338ofez
parent: pqm at pqm.ubuntu.com-20090310060738-6js2ofvx7q1gfg63
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: prepare-1.13
timestamp: Mon 2009-03-09 04:24:18 -0500
message:
[merge] bialix's fix for Win32 progress bars
added:
bzrlib/clean_tree.py clean_tree.py-20050827022328-5ba46e22d074695c
bzrlib/tests/blackbox/test_clean_tree.py test_clean_tree.py-20090219235516-em1ybc01twsqacx9-1
bzrlib/tests/test_clean_tree.py test_clean_tree.py-20060603174249-ozlk5sl2166opxbk-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
------------------------------------------------------------
revno: 4087.1.4
revision-id: tanner at real-time.com-20090309021608-p6c9twfqu338ofez
parent: tanner at real-time.com-20090308145836-k2vjfy8lkas3rxal
parent: pqm at pqm.ubuntu.com-20090309084556-9i2m12qlud2qcrtw
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: prepare-1.13
timestamp: Sun 2009-03-08 21:16:08 -0500
message:
[merge] latest files from trunk before making rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/EncodingAdapter.py EncodingAdapter.py-20060113032051-4d7e1d8c1e38b4a1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/per_interbranch/__init__.py __init__.py-20090225010018-l7w4uvvt73ea2vj9-1
bzrlib/tests/per_lock/__init__.py __init__.py-20070314201444-u92yjsqrkh2m3qcb-1
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
------------------------------------------------------------
revno: 4087.1.3
revision-id: tanner at real-time.com-20090308145836-k2vjfy8lkas3rxal
parent: tanner at real-time.com-20090308090712-vgwe6abo43aspgb9
parent: pqm at pqm.ubuntu.com-20090309023123-7hvnfrilrt5ql771
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: prepare-1.13
timestamp: Sun 2009-03-08 09:58:36 -0500
message:
[merge] with trunk to see if bug #339055 has been addressed
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
------------------------------------------------------------
revno: 4087.1.2
revision-id: tanner at real-time.com-20090308090712-vgwe6abo43aspgb9
parent: tanner at real-time.com-20090306201145-dgepzhpzi830tsfy
parent: pqm at pqm.ubuntu.com-20090306214205-sa9k572tezp8s0a1
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: prepare-1.13
timestamp: Sun 2009-03-08 04:07:12 -0500
message:
* [merge] with trunk in attempt to get make check-dist-tarball working
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 4087.1.1
revision-id: tanner at real-time.com-20090306201145-dgepzhpzi830tsfy
parent: pqm at pqm.ubuntu.com-20090306193539-h0q6dlyayhgcehta
committer: Robert J. Tanner <tanner at real-time.com>
branch nick: prepare-1.13
timestamp: Fri 2009-03-06 14:11:45 -0600
message:
Release 1.13rc1.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS 2009-03-12 00:16:49 +0000
+++ b/NEWS 2009-03-12 03:02:41 +0000
@@ -10,15 +10,50 @@
COMPATIBILITY BREAKS:
+ * bzr no longer autodetects nested trees as 'tree-references'. They
+ must now be explicitly added tree references. At the commandline, use
+ join --reference instead of add. (Aaron Bentley)
+
+ NEW FEATURES:
+
+ IMPROVEMENTS:
+
+ * Progress bars now show the rate of network activity for
+ ``bzr+ssh://`` and ``bzr://`` connections. (Andrew Bennetts)
+
+ * Tildes are no longer escaped. No more %7Euser/project/branch!
+ (Jonathan Lange)
+
+ BUG FIXES:
+
+ DOCUMENTATION:
+
+ * The generated manpage now explicitly lists aliases as commands.
+ (James Westby, #336998)
+
+ API CHANGES:
+
+ * New sort order for ``get_record_stream`` ``groupcompress`` which
+ sorts optimally for use with groupcompress compressors. (John Arbash
+ Meinel, Robert Collins)
+
+ INTERNALS:
+
+
+bzr 1.13rc1 "paraskavedekatriaphobia" 2009-03-10
+------------------------------------------------
+This release includes bug fixes and a few performance and feature improvements.
+GNU Changelog output can now be produced by ``bzr log --format gnu-changelog``.
+Debug flags can now be set in ``~/.bazaar/bazaar.conf``. Lightweight Checkouts
+and Stacked Branches should both be much faster over remote connections.
+
+ COMPATIBILITY BREAKS:
+
* ``bzr log --line`` now indicates which revisions are merges with
`[merge]` after the date. Scripts which parse the output of this
command may need to be adjusted.
(Neil Martinsen-Burrell)
- * bzr no longer autodetects nested trees as 'tree-references'. They
- must now be explicitly added tree references. At the commandline, use
- join --reference instead of add. (Aaron Bentley)
-
NEW FEATURES:
* ``bzr reconfigure`` now supports --with-trees and --with-no-trees
@@ -74,9 +109,6 @@
batches up requests into approx 5MB requests, rather than a separate
request for each file. (John Arbash Meinel)
- * Progress bars now show the rate of network activity for
- ``bzr+ssh://`` and ``bzr://`` connections. (Andrew Bennetts)
-
* Support for GSSAPI authentication when using HTTP or HTTPS.
(Jelmer Vernooij)
@@ -92,9 +124,6 @@
* ``bzr send`` now supports MH-E via ``emacsclient``. (Eric Gillespie)
- * Tildes are no longer escaped. No more %7Euser/project/branch!
- (Jonathan Lange)
-
BUG FIXES:
* Bazaar now gives a better message including the filename if it's
@@ -142,6 +171,9 @@
* ``setup.py build_ext`` now gives a proper error when an extension
fails to build. (John Arbash Meinel)
+ * Symlinks to non ascii file names are now supported.
+ (Robert Collins, Vincent Ladeuil, #339055, #272444)
+
* Under rare circumstances (aka nobody reported a bug about it), the ftp
transport could revert to ascii mode. It now stays in binary mode except
when needed.
@@ -163,9 +195,6 @@
* The documentation for ``shelve`` and ``unshelve`` has been clarified.
(Daniel Watkins, #327421, #327425)
- * The generated manpage now explicitly lists aliases as commands.
- (James Westby, #336998)
-
API CHANGES:
* ``bzr selftest`` now fails if the bazaar sources contain trailing
@@ -184,10 +213,6 @@
* MutableTree.commit now favours the "authors" argument, with the old
"author" argument being deprecated.
- * New sort order for ``get_record_stream`` ``groupcompress`` which
- sorts optimally for use with groupcompress compressors. (John Arbash
- Meinel, Robert Collins)
-
* Remove deprecated EmptyTree. (Martin Pool)
* ``Repository.fetch`` now accepts an optional ``fetch_spec``
=== modified file 'bzr'
--- a/bzr 2009-02-23 15:29:35 +0000
+++ b/bzr 2009-03-12 03:02:41 +0000
@@ -22,7 +22,7 @@
import sys
# update this on each release
-_script_version = (1, 13, 0)
+_script_version = (1, 14, 0)
if __doc__ is None:
print "bzr does not support python -OO."
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2009-03-10 01:16:51 +0000
+++ b/bzrlib/__init__.py 2009-03-12 03:02:41 +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, 13, 0, 'dev', 0)
+version_info = (1, 14, 0, 'dev', 0)
# API compatibility version: bzrlib is currently API compatible with 1.13.
=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py 2009-03-11 01:53:16 +0000
+++ b/bzrlib/dirstate.py 2009-03-12 03:02:41 +0000
@@ -1588,7 +1588,18 @@
# already in memory. However, this really needs to be done at a
# higher level, because there either won't be anything on disk,
# or the thing on disk will be a file.
- return os.readlink(abspath.encode(osutils._fs_enc))
+ fs_encoding = osutils._fs_enc
+ if isinstance(abspath, unicode):
+ # abspath is defined as the path to pass to lstat. readlink is
+ # buggy in python < 2.6 (it doesn't encode unicode path into FS
+ # encoding), so we need to encode ourselves knowing that unicode
+ # paths are produced by UnicodeDirReader on purpose.
+ abspath = abspath.encode(fs_encoding)
+ target = os.readlink(abspath)
+ if fs_encoding not in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968'):
+ # Change encoding if needed
+ target = target.decode(fs_encoding).encode('UTF-8')
+ return target
def get_ghosts(self):
"""Return a list of the parent tree revision ids that are ghosts."""
@@ -1866,8 +1877,10 @@
size = 0
executable = False
elif kind == 'symlink':
- # We don't support non-ascii targets for symlinks yet.
- fingerprint = str(inv_entry.symlink_target or '')
+ if inv_entry.symlink_target is None:
+ fingerprint = ''
+ else:
+ fingerprint = inv_entry.symlink_target.encode('utf8')
size = 0
executable = False
elif kind == 'file':
@@ -3407,7 +3420,7 @@
while (current_entry is not None or
current_path_info is not None):
if current_entry is None:
- # the check for path_handled when the path is adnvaced
+ # the check for path_handled when the path is advanced
# will yield this path if needed.
pass
elif current_path_info is None:
=== modified file 'bzrlib/tests/branch_implementations/test_sprout.py'
--- a/bzrlib/tests/branch_implementations/test_sprout.py 2009-03-03 05:50:55 +0000
+++ b/bzrlib/tests/branch_implementations/test_sprout.py 2009-03-09 16:32:31 +0000
@@ -143,14 +143,10 @@
os.symlink(u'\u03a9','tree1/link_name')
tree.add(['link_name'],['link-id'])
- try:
- # python 2.7a0 failed on commit:
- revision = tree.commit('added a link to a Unicode target')
- # python 2.5 failed on sprout:
- tree.bzrdir.sprout('target')
- except UnicodeEncodeError, e:
- raise KnownFailure('there is no support for'
- ' symlinks to non-ASCII targets (bug #272444)')
+ # python 2.7a0 failed on commit:
+ revision = tree.commit('added a link to a Unicode target')
+ # python 2.5 failed on sprout:
+ tree.bzrdir.sprout('target')
def assertBranchHookBranchIsStacked(self, pre_change_params):
# Just calling will either succeed or fail.
=== modified file 'bzrlib/tests/tree_implementations/test_path_content_summary.py'
--- a/bzrlib/tests/tree_implementations/test_path_content_summary.py 2009-01-30 18:12:41 +0000
+++ b/bzrlib/tests/tree_implementations/test_path_content_summary.py 2009-03-09 16:32:31 +0000
@@ -52,6 +52,19 @@
summary = self._convert_tree(tree).path_content_summary(u'\u03b2-path')
self.assertEqual(('symlink', None, None, 'target'), summary)
+ def test_unicode_symlink_target_summary(self):
+ self.requireFeature(SymlinkFeature)
+ tree = self.make_branch_and_tree('tree')
+ try:
+ os.symlink(u'tree/\u03b2-path'.encode(_fs_enc), 'tree/link')
+ except UnicodeError:
+ raise TestSkipped(
+ 'This platform does not support unicode file paths.')
+
+ tree.add(['link'])
+ summary = self._convert_tree(tree).path_content_summary('link')
+ self.assertEqual(('symlink', None, None, u'tree/\u03b2-path'), summary)
+
def test_missing_content_summary(self):
tree = self.make_branch_and_tree('tree')
summary = self._convert_tree(tree).path_content_summary('path')
=== modified file 'bzrlib/tests/workingtree_implementations/test_parents.py'
--- a/bzrlib/tests/workingtree_implementations/test_parents.py 2009-01-17 01:30:58 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_parents.py 2009-03-09 16:32:31 +0000
@@ -245,16 +245,12 @@
os.symlink(u'\u03a9','tree1/link_name')
tree.add(['link_name'],['link-id'])
- try:
- # the actual commit occurs without errors (strangely):
- revision1 = tree.commit('added a link to a Unicode target')
- # python 2.4 failed with UnicodeDecodeError on this commit:
- revision2 = tree.commit('this revision will be discarded')
- # python 2.5 failed with UnicodeEncodeError on set_parent_ids:
- tree.set_parent_ids([revision1])
- except (UnicodeEncodeError, UnicodeDecodeError):
- raise KnownFailure('there is no support for'
- ' symlinks to non-ASCII targets (bug #272444)')
+ # the actual commit occurs without errors (strangely):
+ revision1 = tree.commit('added a link to a Unicode target')
+ # python 2.4 failed with UnicodeDecodeError on this commit:
+ revision2 = tree.commit('this revision will be discarded')
+ # python 2.5 failed with UnicodeEncodeError on set_parent_ids:
+ tree.set_parent_ids([revision1])
class TestAddParent(TestParents):
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/transform.py 2009-03-09 16:32:31 +0000
@@ -1845,7 +1845,7 @@
size = None
executable = None
if kind == 'symlink':
- link_or_sha1 = os.readlink(limbo_name)
+ link_or_sha1 = os.readlink(limbo_name).decode(osutils._fs_enc)
if supports_executable():
executable = tt._new_executability.get(trans_id, executable)
return kind, size, executable, link_or_sha1
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/workingtree.py 2009-03-09 16:32:31 +0000
@@ -729,7 +729,9 @@
kind = 'tree-reference'
return kind, None, None, None
elif kind == 'symlink':
- return ('symlink', None, None, os.readlink(abspath.encode(osutils._fs_enc)))
+ return ('symlink', None, None,
+ os.readlink(abspath.encode(osutils._fs_enc)
+ ).decode(osutils._fs_enc))
else:
return (kind, None, None, None)
More information about the bazaar-commits
mailing list