Rev 3633: Merge bzr.dev, resolve NEWS in http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/uncommit_ids
John Arbash Meinel
john at arbash-meinel.com
Sat Aug 16 00:38:02 BST 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/uncommit_ids
------------------------------------------------------------
revno: 3633
revision-id: john at arbash-meinel.com-20080815233744-o35vp17viznmo2s8
parent: john at arbash-meinel.com-20080815233711-4duhrsmr9rm9dugp
parent: pqm at pqm.ubuntu.com-20080815025810-eguaiqf0kwwqo4yp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: uncommit_ids
timestamp: Fri 2008-08-15 18:37:44 -0500
message:
Merge bzr.dev, resolve NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
------------------------------------------------------------
revno: 3629.1.7
revision-id: pqm at pqm.ubuntu.com-20080815025810-eguaiqf0kwwqo4yp
parent: pqm at pqm.ubuntu.com-20080814211426-i0rmbyhjxf4hi7pt
parent: john at arbash-meinel.com-20080814201521-vz11z6uh7b0pcnxg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-08-15 03:58:10 +0100
message:
(jam) RemoteBranch.revision_id_to_revno defers to the real branch
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3629.4.1
revision-id: john at arbash-meinel.com-20080814201521-vz11z6uh7b0pcnxg
parent: pqm at pqm.ubuntu.com-20080814195737-7tpxreg897vxlmr5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: remote_rev_id_to_revno
timestamp: Thu 2008-08-14 15:15:21 -0500
message:
Thunk over to the real branch's revision_id_to_revno.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3629.1.6
revision-id: pqm at pqm.ubuntu.com-20080814211426-i0rmbyhjxf4hi7pt
parent: pqm at pqm.ubuntu.com-20080814195737-7tpxreg897vxlmr5
parent: john at arbash-meinel.com-20080814204222-a1ya5pp0pr7lmev8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 22:14:26 +0100
message:
(jam)(trivial) NEWS fix
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3629.3.1
revision-id: john at arbash-meinel.com-20080814204222-a1ya5pp0pr7lmev8
parent: pqm at pqm.ubuntu.com-20080814195737-7tpxreg897vxlmr5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 15:42:22 -0500
message:
Fix an incorrectly placed NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3629.1.5
revision-id: pqm at pqm.ubuntu.com-20080814195737-7tpxreg897vxlmr5
parent: pqm at pqm.ubuntu.com-20080814185546-98x0mdzxsmj5b5wr
parent: john at arbash-meinel.com-20080814192259-lwm1mqhwgzi3u600
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 20:57:37 +0100
message:
(jam) Merge bzr-1.6rc3 into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3629.2.1
revision-id: john at arbash-meinel.com-20080814192259-lwm1mqhwgzi3u600
parent: pqm at pqm.ubuntu.com-20080814185546-98x0mdzxsmj5b5wr
parent: pqm at pqm.ubuntu.com-20080814165207-0sfq9u9vy6rl7oxc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 14:22:59 -0500
message:
Merge bzr-1.6rc3 into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.5.5
revision-id: pqm at pqm.ubuntu.com-20080814165207-0sfq9u9vy6rl7oxc
parent: pqm at pqm.ubuntu.com-20080814161828-cnj0l5hcd118zmt5
parent: john at arbash-meinel.com-20080814151046-75yoco8fdw9mk2ny
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 17:52:07 +0100
message:
Release bzr-1.6rc3
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.6.3
revision-id: john at arbash-meinel.com-20080814151046-75yoco8fdw9mk2ny
parent: john at arbash-meinel.com-20080814150333-gth1p57ghvbpu54o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 10:10:46 -0500
message:
Update version strings for bzr-1.6rc3
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.6.2
revision-id: john at arbash-meinel.com-20080814150333-gth1p57ghvbpu54o
parent: john at arbash-meinel.com-20080814145830-hsj8dytdcqze3mvg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 10:03:33 -0500
message:
Add NEWS entries for the other changes that were added for bzr-1.6rc3
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3606.5.4
revision-id: pqm at pqm.ubuntu.com-20080814161828-cnj0l5hcd118zmt5
parent: pqm at pqm.ubuntu.com-20080814055033-myv5ibn1lb50yf0t
parent: john at arbash-meinel.com-20080814145830-hsj8dytdcqze3mvg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 17:18:28 +0100
message:
(robertc) Trigger index._buffer_all when a significant (>1/20) of the
index is being queried.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 3606.6.1
revision-id: john at arbash-meinel.com-20080814145830-hsj8dytdcqze3mvg
parent: pqm at pqm.ubuntu.com-20080814055033-myv5ibn1lb50yf0t
author: Robert Collins <robertc at robertcollins.net>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 09:58:30 -0500
message:
Cherry-pick Robert's index buffering.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 3606.5.3
revision-id: pqm at pqm.ubuntu.com-20080814055033-myv5ibn1lb50yf0t
parent: pqm at pqm.ubuntu.com-20080814051958-e951os44voh2p373
parent: mhammond at skippinet.com.au-20080814014130-ohoxsrqy94jldajv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 06:50:33 +0100
message:
(Mark Hammond) Updates to setup.py to support bundling tortoisebzr
and qbzr into the standalone win32 installer.
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3606.5.2
revision-id: pqm at pqm.ubuntu.com-20080814051958-e951os44voh2p373
parent: pqm at pqm.ubuntu.com-20080814045127-s91yxfoqylz4i6jr
parent: john at arbash-meinel.com-20080814030842-fuc2xackfdyatf42
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 06:19:58 +0100
message:
(robertc) Disable reading .bzrrules from the working tree.
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3606.5.1
revision-id: pqm at pqm.ubuntu.com-20080814045127-s91yxfoqylz4i6jr
parent: pqm at pqm.ubuntu.com-20080813185456-kn2cq6pkj6h52z9k
parent: andrew.bennetts at canonical.com-20080814021531-3axt0ak75mpxobrk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 05:51:27 +0100
message:
(spiv) Fix a regression in bzr+http:// where http wasn't implementing
a necessary function.
modified:
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
------------------------------------------------------------
revno: 3629.1.4
revision-id: pqm at pqm.ubuntu.com-20080814185546-98x0mdzxsmj5b5wr
parent: pqm at pqm.ubuntu.com-20080814182509-9f2dz3kcb1lv5lku
parent: john at arbash-meinel.com-20080814170856-p2ie5z7l6vowrftz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 19:55:46 +0100
message:
(Marius Kruger) 'bzr init' and 'bzr init-repo' print 'bzr info' on
success
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
------------------------------------------------------------
revno: 3535.9.9
revision-id: john at arbash-meinel.com-20080814170856-p2ie5z7l6vowrftz
parent: amanic at gmail.com-20080718094435-jfxdvrxgx09zgnuc
parent: pqm at pqm.ubuntu.com-20080814074117-x0zvzzv7y6mok8pz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: init_verbose
timestamp: Thu 2008-08-14 12:08:56 -0500
message:
merge bzr.dev 3629, update NEWS entry to be in correct location.
added:
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/_patiencediff_py.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
bzrlib/export/dir_exporter.py dir_exporter.py-20051114235828-b51397f56bc7b117
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/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/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
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/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-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_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3535.9.8
revision-id: amanic at gmail.com-20080718094435-jfxdvrxgx09zgnuc
parent: amanic at gmail.com-20080718073034-gprz0287fytfoyx6
parent: pqm at pqm.ubuntu.com-20080718030707-qimx9fv1d4xhlk1m
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Fri 2008-07-18 11:44:35 +0200
message:
merg bzr.dev, moving news to the IN DEVELOPMENT section again
added:
bzrlib/_walkdirs_win32.h _walkdirs_win32.h-20080716220454-kweh3tgxez5dvw2l-1
bzrlib/_walkdirs_win32.pyx _walkdirs_win32.pyx-20080716220454-kweh3tgxez5dvw2l-2
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/repository_implementations/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/test__walkdirs_win32.py test__walkdirs_win32-20080716220454-kweh3tgxez5dvw2l-3
doc/en/user-guide/stacked.txt stacked.txt-20080711023247-4uh9oovoka0sze8b-1
tools/win32/run_script.py run_script.py-20080717003927-k6itvarbtnwk44o9-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 3535.9.7
revision-id: amanic at gmail.com-20080718073034-gprz0287fytfoyx6
parent: amanic at gmail.com-20080718072906-yu692u98u9aj17z8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Fri 2008-07-18 09:30:34 +0200
message:
add news entry
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3535.9.6
revision-id: amanic at gmail.com-20080718072906-yu692u98u9aj17z8
parent: amanic at gmail.com-20080718071023-xszw4d1jqzv6rlhy
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Fri 2008-07-18 09:29:06 +0200
message:
add explicit blackbox tests for 'init -q' and 'init-repo -q'
modified:
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
------------------------------------------------------------
revno: 3535.9.5
revision-id: amanic at gmail.com-20080718071023-xszw4d1jqzv6rlhy
parent: amanic at gmail.com-20080718070912-u44kb9nja7weozl7
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Fri 2008-07-18 09:10:23 +0200
message:
remove a trailing space I added
modified:
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
------------------------------------------------------------
revno: 3535.9.4
revision-id: amanic at gmail.com-20080718070912-u44kb9nja7weozl7
parent: amanic at gmail.com-20080716202450-qxzsk7mpfkl5gset
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Fri 2008-07-18 09:09:12 +0200
message:
use open_containing_from_transport in stead of open_containing
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3535.9.3
revision-id: amanic at gmail.com-20080716202450-qxzsk7mpfkl5gset
parent: amanic at gmail.com-20080713161536-gkuyj05s28qpaj8c
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Wed 2008-07-16 22:24:50 +0200
message:
init/init-repo shouldn't open 2 connections
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
------------------------------------------------------------
revno: 3535.9.2
revision-id: amanic at gmail.com-20080713161536-gkuyj05s28qpaj8c
parent: amanic at gmail.com-20080713084342-xtnrwlxrrsdpsufy
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Sun 2008-07-13 18:15:36 +0200
message:
make init and init-repo tests pass again
modified:
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
------------------------------------------------------------
revno: 3535.9.1
revision-id: amanic at gmail.com-20080713084342-xtnrwlxrrsdpsufy
parent: pqm at pqm.ubuntu.com-20080709135859-wq3r1d1fjcafelgw
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Sun 2008-07-13 10:43:42 +0200
message:
print info after init and init-repo
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3629.1.3
revision-id: pqm at pqm.ubuntu.com-20080814182509-9f2dz3kcb1lv5lku
parent: pqm at pqm.ubuntu.com-20080814175522-mho538328p19v77a
parent: john at arbash-meinel.com-20080814170306-ucffga2qhv6kwgju
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 19:25:09 +0100
message:
(robertc) Trigger index._buffer_all when a significant portion of the
index is being queried.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 3620.3.2
revision-id: john at arbash-meinel.com-20080814170306-ucffga2qhv6kwgju
parent: robertc at robertcollins.net-20080814042150-n13mos3tt90xw2rp
parent: pqm at pqm.ubuntu.com-20080814074117-x0zvzzv7y6mok8pz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 12:03:06 -0500
message:
Merge in bzr.dev, resolve NEWS
added:
doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3620.3.1
revision-id: robertc at robertcollins.net-20080814042150-n13mos3tt90xw2rp
parent: pqm at pqm.ubuntu.com-20080812201855-9qxbdo0t2h9byzhj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: index.trigger
timestamp: Thu 2008-08-14 14:21:50 +1000
message:
Cause a full index read when a single index query is larger than 1/20th the index capacity.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 3629.1.2
revision-id: pqm at pqm.ubuntu.com-20080814175522-mho538328p19v77a
parent: pqm at pqm.ubuntu.com-20080814172543-nl22gdcodusa8rt0
parent: john at arbash-meinel.com-20080814165925-tg8kwwp6vagaq7tv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 18:55:22 +0100
message:
(Adrian Wilkins) Use osutils.pathjoin() rather than os.path.join() to
set the base directory for tests
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3613.3.5
revision-id: john at arbash-meinel.com-20080814165925-tg8kwwp6vagaq7tv
parent: adrian.wilkins at gmail.com-20080808083626-b5s7pwjxhtpsdgnr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: base_test_path
timestamp: Thu 2008-08-14 11:59:25 -0500
message:
use the right notation for pathjoin.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3613.3.4
revision-id: adrian.wilkins at gmail.com-20080808083626-b5s7pwjxhtpsdgnr
parent: adrian.wilkins at gmail.com-20080807165131-ckgunbopmmg0kown
committer: Adrian Wilkins <adrian.wilkins at gmail.com>
branch nick: bzr.base_test_path_win32
timestamp: Fri 2008-08-08 09:36:26 +0100
message:
Use pathjoin instead of joinpath just in case anyone ever uses `..`
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3613.3.3
revision-id: adrian.wilkins at gmail.com-20080807165131-ckgunbopmmg0kown
parent: adrian.wilkins at gmail.com-20080807162141-ypgdgc2l26tuz9p3
committer: Adrian Wilkins <adrian.wilkins at gmail.com>
branch nick: bzr.base_test_path_win32
timestamp: Thu 2008-08-07 17:51:31 +0100
message:
Correctly use osutils.joinpath instead of trying to use non-existent osutils.join()
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3613.3.2
revision-id: adrian.wilkins at gmail.com-20080807162141-ypgdgc2l26tuz9p3
parent: adrian.wilkins at gmail.com-20080807153130-bcr87cssqdsdwjtf
committer: Adrian Wilkins <adrian.wilkins at gmail.com>
branch nick: bzr.base_test_path_win32
timestamp: Thu 2008-08-07 17:21:41 +0100
message:
Changed to osutils.join as suggested
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3613.3.1
revision-id: adrian.wilkins at gmail.com-20080807153130-bcr87cssqdsdwjtf
parent: pqm at pqm.ubuntu.com-20080807005717-qxnuq9je71bt9tcs
committer: Adrian Wilkins <adrian.wilkins at gmail.com>
branch nick: bzr.base_test_path_win32
timestamp: Thu 2008-08-07 16:31:30 +0100
message:
Changed the base directory setup to use urlutils.join instead of os.path.join
It's a small thing, but on win32, any tests that examine the absolute path of
files will fail because they see a backslash where they were expecting a slash.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3629.1.1
revision-id: pqm at pqm.ubuntu.com-20080814172543-nl22gdcodusa8rt0
parent: pqm at pqm.ubuntu.com-20080814074117-x0zvzzv7y6mok8pz
parent: robertc at robertcollins.net-20080813233851-73a632ulysjb935c
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 18:25:43 +0100
message:
(robertc) Disable .bzrrules from being read from the WT
------------------------------------------------------------
revno: 3620.2.2
revision-id: robertc at robertcollins.net-20080813233851-73a632ulysjb935c
parent: robertc at robertcollins.net-20080813233044-84ad8vlkzl1lhnw2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: rules.disable
timestamp: Thu 2008-08-14 09:38:51 +1000
message:
More doc updates.
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3620.2.1
revision-id: robertc at robertcollins.net-20080813233044-84ad8vlkzl1lhnw2
parent: pqm at pqm.ubuntu.com-20080812201855-9qxbdo0t2h9byzhj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: rules.disable
timestamp: Thu 2008-08-14 09:30:44 +1000
message:
Disable .bzrrules in-tree lookup for now.
modified:
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2008-08-15 23:37:11 +0000
+++ b/NEWS 2008-08-15 23:37:44 +0000
@@ -9,8 +9,15 @@
CHANGES:
+ * ``bzr export`` can now export a subdirectory of a project.
+ (Robert Collins)
+
IMPROVEMENTS:
+ * ``bzr init`` and ``bzr init-repo`` will now print out the same as
+ ``bzr info`` if it completed successfully.
+ (Marius Kruger)
+
* ``bzr uncommit`` logs the old tip revision id, and displays how to
restore the branch to that tip using ``bzr pull``. This allows you
to recover if you realize you uncommitted the wrong thing.
@@ -44,15 +51,43 @@
(Robert Collins, Aaron Bentley)
+bzr 1.6rc3 2008-08-14
+---------------------
+
+ CHANGES:
+
+ * Disable reading ``.bzrrules`` as a per-branch rule preferences
+ file. The feature was not quite ready for a full release.
+ (Robert Collins)
+
+ IMPROVEMENTS:
+
+ * Update the windows installer to bundle TortoiseBzr and ``qbzr``
+ into the standalone installer. This will be the first official
+ windows release that installs Tortoise by default.
+ (Mark Hammond)
+
+ BUG FIXES:
+
+ * Fix a regression in ``bzr+http`` support. There was a missing
+ function (``_read_line``) that needed to be carried over from
+ ``bzr+ssh`` support. (Andrew Bennetts)
+
+ * ``GraphIndex`` objects will internally read an entire index if more
+ than 1/20th of their keyspace is requested in a single operation.
+ This largely mitigates a performance regression in ``bzr log FILE``
+ and completely corrects the performance regression in ``bzr log``.
+ The regression was caused by removing an accomodation which had been
+ supporting the index format in use. A newer index format is in
+ development which is substantially faster. (Robert Collins)
+
+
bzr 1.6rc2 2008-08-13
---------------------
This release candidate has a few minor bug fixes, and some regression
fixes for Windows.
- * ``bzr export`` can now export a subdirectory of a project.
- (Robert Collins)
-
BUG FIXES:
* ``bzr upgrade`` on remote branches accessed via bzr:// and
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2008-08-13 22:51:55 +0000
+++ b/bzrlib/__init__.py 2008-08-14 19:22:59 +0000
@@ -47,6 +47,7 @@
# API compatibility version: bzrlib is currently API compatible with 1.7.
api_minimum_version = (1, 7, 0)
+
def _format_version_tuple(version_info):
"""Turn a version number 3-tuple or 5-tuple into a short string.
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-08-15 17:13:12 +0000
+++ b/bzrlib/builtins.py 2008-08-15 23:37:44 +0000
@@ -1311,6 +1311,10 @@
except errors.UpgradeRequired:
raise errors.BzrCommandError('This branch format cannot be set'
' to append-revisions-only. Try --experimental-branch6')
+ if not is_quiet():
+ from bzrlib.info import show_bzrdir_info
+ show_bzrdir_info(bzrdir.BzrDir.open_containing_from_transport(
+ to_transport)[0], verbose=0, outfile=self.outf)
class cmd_init_repository(Command):
@@ -1362,6 +1366,10 @@
newdir = format.initialize_on_transport(to_transport)
repo = newdir.create_repository(shared=True)
repo.set_make_working_trees(not no_trees)
+ if not is_quiet():
+ from bzrlib.info import show_bzrdir_info
+ show_bzrdir_info(bzrdir.BzrDir.open_containing_from_transport(
+ to_transport)[0], verbose=0, outfile=self.outf)
class cmd_diff(Command):
=== modified file 'bzrlib/index.py'
--- a/bzrlib/index.py 2008-07-17 07:33:12 +0000
+++ b/bzrlib/index.py 2008-08-14 19:22:59 +0000
@@ -468,14 +468,20 @@
keys supplied. No additional keys will be returned, and every
key supplied that is in the index will be returned.
"""
- # PERFORMANCE TODO: parse and bisect all remaining data at some
- # threshold of total-index processing/get calling layers that expect to
- # read the entire index to use the iter_all_entries method instead.
keys = set(keys)
if not keys:
return []
if self._size is None and self._nodes is None:
self._buffer_all()
+ # We fit about 20 keys per minimum-read (4K), so if we are looking for
+ # more than 1/20th of the index its likely (assuming homogenous key
+ # spread) that we'll read the entire index. If we're going to do that,
+ # buffer the whole thing. A better analysis might take key spread into
+ # account - but B+Tree indices are better anyway.
+ # We could look at all data read, and use a threshold there, which will
+ # trigger on ancestry walks, but that is not yet fully mapped out.
+ if self._nodes is None and len(keys) * 20 > self.key_count():
+ self._buffer_all()
if self._nodes is not None:
return self._iter_entries_from_total_buffer(keys)
else:
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2008-07-28 09:12:28 +0000
+++ b/bzrlib/remote.py 2008-08-14 20:15:21 +0000
@@ -1593,6 +1593,11 @@
def is_locked(self):
return self._lock_count >= 1
+ @needs_read_lock
+ def revision_id_to_revno(self, revision_id):
+ self._ensure_real()
+ return self._real_branch.revision_id_to_revno(revision_id)
+
@needs_write_lock
def set_last_revision_info(self, revno, revision_id):
revision_id = ensure_null(revision_id)
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2008-08-13 01:30:46 +0000
+++ b/bzrlib/tests/__init__.py 2008-08-14 17:55:22 +0000
@@ -2064,7 +2064,7 @@
For TestCaseInTempDir we create a temporary directory based on the test
name and then create two subdirs - test and home under it.
"""
- name_prefix = os.path.join(self.TEST_ROOT, self._getTestDirPrefix())
+ name_prefix = osutils.pathjoin(self.TEST_ROOT, self._getTestDirPrefix())
name = name_prefix
for i in range(100):
if os.path.exists(name):
=== modified file 'bzrlib/tests/blackbox/test_init.py'
--- a/bzrlib/tests/blackbox/test_init.py 2007-06-27 19:13:50 +0000
+++ b/bzrlib/tests/blackbox/test_init.py 2008-07-18 07:29:06 +0000
@@ -44,7 +44,10 @@
# --format=weave should be accepted to allow interoperation with
# old releases when desired.
out, err = self.run_bzr('init --format=weave')
- self.assertEqual('', out)
+ self.assertEqual("""Standalone tree (format: weave)
+Location:
+ branch root: .
+""", out)
self.assertEqual('', err)
def test_init_at_repository_root(self):
@@ -57,19 +60,32 @@
repo = newdir.create_repository(shared=True)
repo.set_make_working_trees(False)
out, err = self.run_bzr('init repo')
- self.assertEqual('', out)
+ self.assertEqual(
+"""Repository tree (format: pack-0.92)
+Location:
+ shared repository: repo
+ repository branch: repo
+""", out)
self.assertEqual('', err)
newdir.open_branch()
newdir.open_workingtree()
def test_init_branch(self):
out, err = self.run_bzr('init')
- self.assertEqual('', out)
+ self.assertEqual(
+"""Standalone tree (format: pack-0.92)
+Location:
+ branch root: .
+""", out)
self.assertEqual('', err)
# Can it handle subdirectories of branches too ?
out, err = self.run_bzr('init subdir1')
- self.assertEqual('', out)
+ self.assertEqual(
+"""Standalone tree (format: pack-0.92)
+Location:
+ branch root: subdir1
+""", out)
self.assertEqual('', err)
WorkingTree.open('subdir1')
@@ -80,13 +96,21 @@
os.mkdir('subdir2')
out, err = self.run_bzr('init subdir2')
- self.assertEqual('', out)
+ self.assertEqual("""Standalone tree (format: pack-0.92)
+Location:
+ branch root: subdir2
+""", out)
self.assertEqual('', err)
# init an existing branch.
out, err = self.run_bzr('init subdir2', retcode=3)
self.assertEqual('', out)
self.failUnless(err.startswith('bzr: ERROR: Already a branch:'))
+ def test_init_branch_quiet(self):
+ out, err = self.run_bzr('init -q')
+ self.assertEqual('', out)
+ self.assertEqual('', err)
+
def test_init_existing_branch(self):
self.run_bzr('init')
out, err = self.run_bzr('init', retcode=3)
@@ -142,7 +166,9 @@
def test_init(self):
# init on a remote url should succeed.
out, err = self.run_bzr(['init', self.get_url()])
- self.assertEqual('', out)
+ self.assertStartsWith(out, """Standalone branch (format: pack-0.92)
+Location:
+ branch root: """)
self.assertEqual('', err)
def test_init_existing_branch(self):
=== modified file 'bzrlib/tests/blackbox/test_shared_repository.py'
--- a/bzrlib/tests/blackbox/test_shared_repository.py 2007-06-26 20:32:49 +0000
+++ b/bzrlib/tests/blackbox/test_shared_repository.py 2008-07-18 07:29:06 +0000
@@ -26,12 +26,25 @@
def test_make_repository(self):
out, err = self.run_bzr("init-repository a")
+ self.assertEqual(out,
+"""Shared repository with trees (format: pack-0.92)
+Location:
+ shared repository: a
+""")
+ self.assertEqual(err, "")
+ dir = BzrDir.open('a')
+ self.assertIs(dir.open_repository().is_shared(), True)
+ self.assertRaises(errors.NotBranchError, dir.open_branch)
+ self.assertRaises(errors.NoWorkingTree, dir.open_workingtree)
+
+ def test_make_repository_quiet(self):
+ out, err = self.run_bzr("init-repository a -q")
self.assertEqual(out, "")
self.assertEqual(err, "")
dir = BzrDir.open('a')
self.assertIs(dir.open_repository().is_shared(), True)
self.assertRaises(errors.NotBranchError, dir.open_branch)
- self.assertRaises(errors.NoWorkingTree, dir.open_workingtree)
+ self.assertRaises(errors.NoWorkingTree, dir.open_workingtree)
def test_init_repo_existing_dir(self):
"""Make repo in existing directory.
=== modified file 'bzrlib/tests/commands/test_init.py'
--- a/bzrlib/tests/commands/test_init.py 2007-09-11 14:47:02 +0000
+++ b/bzrlib/tests/commands/test_init.py 2008-07-16 20:24:50 +0000
@@ -15,6 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+from bzrlib import tests
from bzrlib.builtins import cmd_init
from bzrlib.tests.transport_util import TestCaseWithConnectionHookedTransport
@@ -27,6 +28,8 @@
def test_init(self):
cmd = cmd_init()
+ # We don't care about the ouput but 'outf' should be defined
+ cmd.outf = tests.StringIOWrapper()
cmd.run(self.get_url())
self.assertEquals(1, len(self.connections))
=== modified file 'bzrlib/tests/commands/test_init_repository.py'
--- a/bzrlib/tests/commands/test_init_repository.py 2007-09-11 14:47:02 +0000
+++ b/bzrlib/tests/commands/test_init_repository.py 2008-07-16 20:24:50 +0000
@@ -15,6 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+from bzrlib import tests
from bzrlib.builtins import cmd_init_repository
from bzrlib.tests.transport_util import TestCaseWithConnectionHookedTransport
@@ -27,6 +28,8 @@
def test_init_repository(self):
cmd = cmd_init_repository()
+ # We don't care about the ouput but 'outf' should be defined
+ cmd.outf = tests.StringIOWrapper()
cmd.run(self.get_url())
self.assertEquals(1, len(self.connections))
More information about the bazaar-commits
mailing list