Rev 4011: (Matthew Fuller, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Feb 16 20:37:23 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4011
revision-id: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
parent: pqm at pqm.ubuntu.com-20090216105404-hjw8bck3ocg47wjz
parent: v.ladeuil+lp at free.fr-20090216164456-p95hvdk5u78p2p1e
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-02-16 17:24:48 +0000
message:
(Matthew Fuller,
Marius Kruger) Allow changing --[no-]trees with reconfigure
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 4009.2.2
revision-id: v.ladeuil+lp at free.fr-20090216164456-p95hvdk5u78p2p1e
parent: v.ladeuil+lp at free.fr-20090216101544-8zwh9wugth3fa90y
parent: v.ladeuil+lp at free.fr-20090216164354-oq6wugejopvahynr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Mon 2009-02-16 17:44:56 +0100
message:
Allow changing --[no-]trees with reconfigure
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3983.3.11
revision-id: v.ladeuil+lp at free.fr-20090216164354-oq6wugejopvahynr
parent: amanic at gmail.com-20090215234536-xuwmbmdw2ktfj4er
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reconfig-trees
timestamp: Mon 2009-02-16 17:43:54 +0100
message:
Fix indentation as per Aaron's review and then some.
* bzrlib/reconfigure.py:
(Reconfigure.set_repository_trees): Fix indentation.
* bzrlib/errors.py:
(AlreadyWithTrees, AlreadyWithNoTrees): Fix indentation.
* bzrlib/builtins.py:
(cmd_reconfigure): Reformat as last Options are lost in the
RegistryOption formatting.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3983.3.10
revision-id: amanic at gmail.com-20090215234536-xuwmbmdw2ktfj4er
parent: amanic at gmail.com-20090215233527-jo6b5687y17019br
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Mon 2009-02-16 01:45:36 +0200
message:
add test_repository_tree_reconfiguration_not_supported
modified:
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3983.3.9
revision-id: amanic at gmail.com-20090215233527-jo6b5687y17019br
parent: amanic at gmail.com-20090215232929-ncde407p5f2nyb7g
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Mon 2009-02-16 01:35:27 +0200
message:
check error message too
modified:
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3983.3.8
revision-id: amanic at gmail.com-20090215232929-ncde407p5f2nyb7g
parent: amanic at gmail.com-20090215231517-4h8jym2obihhe0sm
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Mon 2009-02-16 01:29:29 +0200
message:
use brakets for long string wrapping
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 3983.3.7
revision-id: amanic at gmail.com-20090215231517-4h8jym2obihhe0sm
parent: amanic at gmail.com-20090215225622-jgw66xjmvrv1vf3h
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Mon 2009-02-16 01:15:17 +0200
message:
apply changes in apply again
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3983.3.6
revision-id: amanic at gmail.com-20090215225622-jgw66xjmvrv1vf3h
parent: amanic at gmail.com-20090206014740-6gbah25yvrkocm6t
parent: pqm at pqm.ubuntu.com-20090215032052-9749wepsy6dgnq9l
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Mon 2009-02-16 00:56:22 +0200
message:
merge with bzr.dev and put the NEWS entry in the IN DEVELOPMENT section
added:
bzrlib/help_topics/en/log-formats.txt logformats.txt-20090209081655-5wpbws2oqz8k5oq7-1
bzrlib/plugins/launchpad/test_lp_open.py test_lp_open.py-20090125174355-hxrsxh3sj84225qu-1
bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
doc/developers/colocated-branches.txt colocatedbranches.tx-20090209183539-wv9upczfd8ryyfn1-1
tools/prepare_for_latex.py prepare_for_latex.py-20090212165735-79tn1t4dhnxyz7m9-1
tools/rst2pdf.py rst2pdf.py-20090212165735-79tn1t4dhnxyz7m9-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
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/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
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_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3983.3.5
revision-id: amanic at gmail.com-20090206014740-6gbah25yvrkocm6t
parent: amanic at gmail.com-20090206014504-02t1zvblk0kmqurj
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Fri 2009-02-06 03:47:40 +0200
message:
put bracket back where we found it
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3983.3.4
revision-id: amanic at gmail.com-20090206014504-02t1zvblk0kmqurj
parent: amanic at gmail.com-20090206014019-hx3gq380zo3qxrfp
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Fri 2009-02-06 03:45:04 +0200
message:
Move NEWS to NEW FEATURES section and steal some credit
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3983.3.3
revision-id: amanic at gmail.com-20090206014019-hx3gq380zo3qxrfp
parent: amanic at gmail.com-20090206011136-7pf4507s9f104ku7
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Fri 2009-02-06 03:40:19 +0200
message:
refactor test_make_without_trees_leaves_tree_alone a little
modified:
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
------------------------------------------------------------
revno: 3983.3.2
revision-id: amanic at gmail.com-20090206011136-7pf4507s9f104ku7
parent: amanic at gmail.com-20090205233114-e486iauxjjkwpcrd
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Fri 2009-02-06 03:11:36 +0200
message:
make changes directly in set_repository_trees()
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3983.3.1
revision-id: amanic at gmail.com-20090205233114-e486iauxjjkwpcrd
parent: pqm at pqm.ubuntu.com-20090205110039-w9oelsyvyx160qwy
parent: fullermd at over-yonder.net-20090119084821-jdk3jaz91d0mkm94
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Fri 2009-02-06 01:31:14 +0200
message:
merge Matthew's patch into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3921.4.14
revision-id: fullermd at over-yonder.net-20090119084821-jdk3jaz91d0mkm94
parent: fullermd at over-yonder.net-20090119084648-dvlh1802ug4p0qmt
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Mon 2009-01-19 02:48:21 -0600
message:
Fix set_repository_trees() docstring.
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3921.4.13
revision-id: fullermd at over-yonder.net-20090119084648-dvlh1802ug4p0qmt
parent: fullermd at over-yonder.net-20090119084549-q4wr5mbm0ko14eq4
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Mon 2009-01-19 02:46:48 -0600
message:
Move NEWS entry up to where it belongs.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3921.4.12
revision-id: fullermd at over-yonder.net-20090119084549-q4wr5mbm0ko14eq4
parent: fullermd at over-yonder.net-20090119084402-opbuhrq13v47v07u
parent: pqm at pqm.ubuntu.com-20090119030630-3xdyyi4xj69md8e4
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Mon 2009-01-19 02:45:49 -0600
message:
Merge bzr.dev.
added:
bzrlib/plugins/netrc_credential_store/ netrc_credential_sto-20081006090354-oaoid1olhgk8vevm-1
bzrlib/plugins/netrc_credential_store/__init__.py __init__.py-20081006090402-hd75m8kcrrm0vlz1-1
bzrlib/plugins/netrc_credential_store/tests/ tests-20081006090406-6mddz8j10pux993e-1
bzrlib/plugins/netrc_credential_store/tests/__init__.py __init__.py-20081006090411-vytweyz6sun61d4q-1
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
bzrlib/tests/https_server.py https_server.py-20071121173708-aj8zczi0ziwbwz21-1
bzrlib/tests/ssl_certs/ ssl_certs-20071124141654-dc9za9nho2gmzbri-1
bzrlib/tests/ssl_certs/__init__.py __init__.py-20071124141703-j5hr254lm287lyut-8
bzrlib/tests/ssl_certs/ca.crt ca.crt-20071124141703-j5hr254lm287lyut-7
bzrlib/tests/ssl_certs/ca.key ca.key-20071124141703-j5hr254lm287lyut-6
bzrlib/tests/ssl_certs/create_ssls.py create_ssls.py-20071124141703-j5hr254lm287lyut-5
bzrlib/tests/ssl_certs/server.crt server.crt-20071124141703-j5hr254lm287lyut-4
bzrlib/tests/ssl_certs/server.csr server.csr-20071124141703-j5hr254lm287lyut-3
bzrlib/tests/ssl_certs/server_with_pass.key server_with_pass.key-20071124141703-j5hr254lm287lyut-2
bzrlib/tests/ssl_certs/server_without_pass.key server_without_pass.-20071124141703-j5hr254lm287lyut-1
doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
doc/news-template.txt newstemplate.txt-20090113030949-kn6dn0xcj1rd6vmn-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
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/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patiencediff.py patiencediff.py-20070721205536-jz8gaykeb7xtampk-1
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/ca_bundle.py ca_bundle.py-20070226091335-84kb1xg1r2jjf858-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3921.4.11
revision-id: fullermd at over-yonder.net-20090119084402-opbuhrq13v47v07u
parent: fullermd at over-yonder.net-20090119080454-05ppx0fs76ktg874
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Mon 2009-01-19 02:44:02 -0600
message:
Add a test that --with-no-trees doesn't touch a branch's existing WT.
modified:
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
------------------------------------------------------------
revno: 3921.4.10
revision-id: fullermd at over-yonder.net-20090119080454-05ppx0fs76ktg874
parent: fullermd at over-yonder.net-20090119075451-8hklzevd34wvgao1
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Mon 2009-01-19 02:04:54 -0600
message:
Stop trying to use _plan_changes() wholesale and just move all the
planning logic into set_repository_trees().
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3921.4.9
revision-id: fullermd at over-yonder.net-20090119075451-8hklzevd34wvgao1
parent: fullermd at over-yonder.net-20090109024355-v3z4gp203of33r7s
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Mon 2009-01-19 01:54:51 -0600
message:
Back out _plan_changes() changes for trees frobbing. It's way more
trouble than it's worth.
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3921.4.8
revision-id: fullermd at over-yonder.net-20090109024355-v3z4gp203of33r7s
parent: fullermd at over-yonder.net-20090109024144-pn20yq3of4l1069s
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 20:43:55 -0600
message:
Mention in NEWS what's been done.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3921.4.7
revision-id: fullermd at over-yonder.net-20090109024144-pn20yq3of4l1069s
parent: fullermd at over-yonder.net-20090108082123-rpb8qwvrzpdyof9l
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 20:41:44 -0600
message:
Add a blackbox test for the expected failure trying to change --trees
on a non-shared repo.
modified:
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
------------------------------------------------------------
revno: 3921.4.6
revision-id: fullermd at over-yonder.net-20090108082123-rpb8qwvrzpdyof9l
parent: fullermd at over-yonder.net-20090108081329-sbdnkdjl1pln61kw
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 02:21:23 -0600
message:
Add blackbox tests for reconfigure {--with-trees,--with-no-trees}.
modified:
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
------------------------------------------------------------
revno: 3921.4.5
revision-id: fullermd at over-yonder.net-20090108081329-sbdnkdjl1pln61kw
parent: fullermd at over-yonder.net-20090108080908-fw6qg39rdfp2o206
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 02:13:29 -0600
message:
Add assertions to the unit tests to make sure the reconfiguration
actually did what it was supposed to.
modified:
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3921.4.4
revision-id: fullermd at over-yonder.net-20090108080908-fw6qg39rdfp2o206
parent: fullermd at over-yonder.net-20090108080725-gxxhc5dv4e5y57pe
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 02:09:08 -0600
message:
Add unit tests for Reconfigure.set_repository_trees().
modified:
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3921.4.3
revision-id: fullermd at over-yonder.net-20090108080725-gxxhc5dv4e5y57pe
parent: fullermd at over-yonder.net-20090108080700-d6qm8ozc11fikvbc
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 02:07:25 -0600
message:
Add --with-trees and --with-no-trees to the 'reconfigure' command.
I'm not incredibly happy with these names. However, the obvious
--trees is too easy to confuse with --tree. These seem a reasonable
choice, if not outstanding.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3921.4.2
revision-id: fullermd at over-yonder.net-20090108080700-d6qm8ozc11fikvbc
parent: fullermd at over-yonder.net-20090108080633-navqvw8hxas109nv
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 02:07:00 -0600
message:
Add support in Reconfigure for manipulating the repository setting for
creating working trees.
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3921.4.1
revision-id: fullermd at over-yonder.net-20090108080633-navqvw8hxas109nv
parent: pqm at pqm.ubuntu.com-20081229142916-z08eu2alga2acrh6
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 02:06:33 -0600
message:
Add some error classes for manipulating trees/no-trees settings on
repositories.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
=== modified file 'NEWS'
--- a/NEWS 2009-02-14 18:21:26 +0000
+++ b/NEWS 2009-02-15 22:56:22 +0000
@@ -17,6 +17,10 @@
NEW FEATURES:
+ * ``bzr reconfigure`` now supports --with-trees and --with-no-trees
+ options to change the default tree-creation policy of shared
+ repositories. (Matthew Fuller, Marius Kruger, #145033)
+
IMPROVEMENTS:
* ``bzr branch`` now has a ``--no-tree`` option which turns off the
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2009-02-13 21:21:25 +0000
+++ b/bzrlib/builtins.py 2009-02-16 16:43:54 +0000
@@ -4980,27 +4980,30 @@
_see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
takes_args = ['location?']
- takes_options = [RegistryOption.from_kwargs('target_type',
- title='Target type',
- help='The type to reconfigure the directory to.',
- value_switches=True, enum_switch=False,
- branch='Reconfigure to be an unbound branch '
- 'with no working tree.',
- tree='Reconfigure to be an unbound branch '
- 'with a working tree.',
- checkout='Reconfigure to be a bound branch '
- 'with a working tree.',
- lightweight_checkout='Reconfigure to be a lightweight'
- ' checkout (with no local history).',
- standalone='Reconfigure to be a standalone branch '
- '(i.e. stop using shared repository).',
- use_shared='Reconfigure to use a shared repository.'),
- Option('bind-to', help='Branch to bind checkout to.',
- type=str),
- Option('force',
- help='Perform reconfiguration even if local changes'
- ' will be lost.')
- ]
+ takes_options = [
+ RegistryOption.from_kwargs(
+ 'target_type',
+ title='Target type',
+ help='The type to reconfigure the directory to.',
+ value_switches=True, enum_switch=False,
+ branch='Reconfigure to be an unbound branch with no working tree.',
+ tree='Reconfigure to be an unbound branch with a working tree.',
+ checkout='Reconfigure to be a bound branch with a working tree.',
+ lightweight_checkout='Reconfigure to be a lightweight'
+ ' checkout (with no local history).',
+ standalone='Reconfigure to be a standalone branch '
+ '(i.e. stop using shared repository).',
+ use_shared='Reconfigure to use a shared repository.',
+ with_trees='Reconfigure repository to create '
+ 'working trees on branches by default.',
+ with_no_trees='Reconfigure repository to not create '
+ 'working trees on branches by default.'
+ ),
+ Option('bind-to', help='Branch to bind checkout to.', type=str),
+ Option('force',
+ help='Perform reconfiguration even if local changes'
+ ' will be lost.')
+ ]
def run(self, location=None, target_type=None, bind_to=None, force=False):
directory = bzrdir.BzrDir.open(location)
@@ -5011,8 +5014,8 @@
elif target_type == 'tree':
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
elif target_type == 'checkout':
- reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
- bind_to)
+ reconfiguration = reconfigure.Reconfigure.to_checkout(
+ directory, bind_to)
elif target_type == 'lightweight-checkout':
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
directory, bind_to)
@@ -5020,6 +5023,12 @@
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
elif target_type == 'standalone':
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
+ elif target_type == 'with-trees':
+ reconfiguration = reconfigure.Reconfigure.set_repository_trees(
+ directory, True)
+ elif target_type == 'with-no-trees':
+ reconfiguration = reconfigure.Reconfigure.set_repository_trees(
+ directory, False)
reconfiguration.apply(force)
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2009-02-11 00:29:57 +0000
+++ b/bzrlib/errors.py 2009-02-16 16:43:54 +0000
@@ -2744,6 +2744,18 @@
_fmt = "'%(display_url)s' is already standalone."
+class AlreadyWithTrees(BzrDirError):
+
+ _fmt = ("Shared repository '%(display_url)s' already creates "
+ "working trees.")
+
+
+class AlreadyWithNoTrees(BzrDirError):
+
+ _fmt = ("Shared repository '%(display_url)s' already doesn't create "
+ "working trees.")
+
+
class ReconfigurationNotSupported(BzrDirError):
_fmt = "Requested reconfiguration of '%(display_url)s' is not supported."
=== modified file 'bzrlib/reconfigure.py'
--- a/bzrlib/reconfigure.py 2008-04-24 04:58:42 +0000
+++ b/bzrlib/reconfigure.py 2009-02-16 16:43:54 +0000
@@ -62,6 +62,7 @@
self._create_tree = False
self._create_repository = False
self._destroy_repository = False
+ self._repository_trees = None
@staticmethod
def to_branch(bzrdir):
@@ -140,6 +141,21 @@
raise errors.AlreadyStandalone(bzrdir)
return reconfiguration
+ @classmethod
+ def set_repository_trees(klass, bzrdir, with_trees):
+ """Adjust a repository's working tree presence default"""
+ reconfiguration = klass(bzrdir)
+ if not reconfiguration.repository.is_shared():
+ raise errors.ReconfigurationNotSupported(reconfiguration.bzrdir)
+ if with_trees and reconfiguration.repository.make_working_trees():
+ raise errors.AlreadyWithTrees(bzrdir)
+ elif (not with_trees
+ and not reconfiguration.repository.make_working_trees()):
+ raise errors.AlreadyWithNoTrees(bzrdir)
+ else:
+ reconfiguration._repository_trees = with_trees
+ return reconfiguration
+
def _plan_changes(self, want_tree, want_branch, want_bound,
want_reference):
"""Determine which changes are needed to assume the configuration"""
@@ -302,3 +318,5 @@
local_branch.bind(branch.Branch.open(bind_location))
if self._destroy_repository:
self.bzrdir.destroy_repository()
+ if self._repository_trees is not None:
+ repo.set_make_working_trees(self._repository_trees)
=== modified file 'bzrlib/tests/blackbox/test_reconfigure.py'
--- a/bzrlib/tests/blackbox/test_reconfigure.py 2008-04-12 05:48:07 +0000
+++ b/bzrlib/tests/blackbox/test_reconfigure.py 2009-02-06 01:40:19 +0000
@@ -86,3 +86,44 @@
tree = workingtree.WorkingTree.open('repo/tree')
self.assertEqual(tree.bzrdir.root_transport.base,
tree.branch.repository.bzrdir.root_transport.base)
+
+ def test_make_with_trees(self):
+ repo = self.make_repository('repo', shared=True)
+ repo.set_make_working_trees(False)
+ self.run_bzr('reconfigure --with-trees', working_dir='repo')
+ self.assertIs(True, repo.make_working_trees())
+
+ def test_make_with_trees_already_trees(self):
+ repo = self.make_repository('repo', shared=True)
+ repo.set_make_working_trees(True)
+ self.run_bzr_error([" already creates working trees"],
+ 'reconfigure --with-trees repo')
+
+ def test_make_without_trees(self):
+ repo = self.make_repository('repo', shared=True)
+ repo.set_make_working_trees(True)
+ self.run_bzr('reconfigure --with-no-trees', working_dir='repo')
+ self.assertIs(False, repo.make_working_trees())
+
+ def test_make_without_trees_already_no_trees(self):
+ repo = self.make_repository('repo', shared=True)
+ repo.set_make_working_trees(False)
+ self.run_bzr_error([" already doesn't create working trees"],
+ 'reconfigure --with-no-trees repo')
+
+ def test_make_with_trees_nonshared_repo(self):
+ branch = self.make_branch('branch')
+ self.run_bzr_error(
+ ["Requested reconfiguration of '.*' is not supported"],
+ 'reconfigure --with-trees branch')
+
+ def test_make_without_trees_leaves_tree_alone(self):
+ repo = self.make_repository('repo', shared=True)
+ branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
+ tree = workingtree.WorkingTree.open('repo/branch')
+ self.build_tree(['repo/branch/foo'])
+ tree.add('foo')
+ self.run_bzr('reconfigure --with-no-trees --force',
+ working_dir='repo/branch')
+ self.failUnlessExists('repo/branch/foo')
+ tree = workingtree.WorkingTree.open('repo/branch')
=== modified file 'bzrlib/tests/test_reconfigure.py'
--- a/bzrlib/tests/test_reconfigure.py 2008-04-25 22:16:00 +0000
+++ b/bzrlib/tests/test_reconfigure.py 2009-02-15 23:45:36 +0000
@@ -377,3 +377,43 @@
def test_unsynced_branch_to_lightweight_checkout_forced(self):
reconfiguration = self.make_unsynced_branch_reconfiguration()
reconfiguration.apply(force=True)
+
+ def make_repository_with_without_trees(self, with_trees):
+ repo = self.make_repository('repo', shared=True)
+ repo.set_make_working_trees(with_trees)
+ return repo
+
+ def test_make_with_trees(self):
+ repo = self.make_repository_with_without_trees(False)
+ reconfiguration = reconfigure.Reconfigure.set_repository_trees(
+ repo.bzrdir, True)
+ reconfiguration.apply()
+ self.assertIs(True, repo.make_working_trees())
+
+ def test_make_without_trees(self):
+ repo = self.make_repository_with_without_trees(True)
+ reconfiguration = reconfigure.Reconfigure.set_repository_trees(
+ repo.bzrdir, False)
+ reconfiguration.apply()
+ self.assertIs(False, repo.make_working_trees())
+
+ def test_make_with_trees_already_with_trees(self):
+ repo = self.make_repository_with_without_trees(True)
+ e = self.assertRaises(errors.AlreadyWithTrees,
+ reconfigure.Reconfigure.set_repository_trees, repo.bzrdir, True)
+ self.assertContainsRe(str(e),
+ r"Shared repository '.*' already creates working trees.")
+
+ def test_make_without_trees_already_no_trees(self):
+ repo = self.make_repository_with_without_trees(False)
+ e = self.assertRaises(errors.AlreadyWithNoTrees,
+ reconfigure.Reconfigure.set_repository_trees, repo.bzrdir, False)
+ self.assertContainsRe(str(e),
+ r"Shared repository '.*' already doesn't create working trees.")
+
+ def test_repository_tree_reconfiguration_not_supported(self):
+ tree = self.make_branch_and_tree('tree')
+ e = self.assertRaises(errors.ReconfigurationNotSupported,
+ reconfigure.Reconfigure.set_repository_trees, tree.bzrdir, None)
+ self.assertContainsRe(str(e),
+ r"Requested reconfiguration of '.*' is not supported.")
More information about the bazaar-commits
mailing list