Rev 3113: Allow reconfiguring trees to light checkouts, repos to anything (abentley) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Dec 14 16:39:24 GMT 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3113
revision-id:pqm at pqm.ubuntu.com-20071214163914-dqiqxlhho36ce54r
parent: pqm at pqm.ubuntu.com-20071214143021-aus9m0gqj1u9gr7n
parent: abentley at panoramicfeedback.com-20071214153828-wc2w1i8ey025bb8x
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-12-14 16:39:14 +0000
message:
Allow reconfiguring trees to light checkouts, repos to anything (abentley)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 2796.2.28
revision-id:abentley at panoramicfeedback.com-20071214153828-wc2w1i8ey025bb8x
parent: abentley at panoramicfeedback.com-20071214152549-1iivfmokscum5ggu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.reconfigure
timestamp: Fri 2007-12-14 10:38:28 -0500
message:
Add NEWS entry
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2796.2.27
revision-id:abentley at panoramicfeedback.com-20071214152549-1iivfmokscum5ggu
parent: abentley at panoramicfeedback.com-20071213163854-gm8kmnc06e6wo9mp
parent: pqm at pqm.ubuntu.com-20071214084717-xu119wq2x8l2w8lj
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.reconfigure
timestamp: Fri 2007-12-14 10:25:49 -0500
message:
Merge with bzr.dev
added:
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
index.txt index.txt-20071121073725-0corxykv5irjal00-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/authentication_conf.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
doc/en/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 2796.2.26
revision-id:abentley at panoramicfeedback.com-20071213163854-gm8kmnc06e6wo9mp
parent: abentley at panoramicfeedback.com-20071212152545-jcka1pitrjwy0dae
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.reconfigure
timestamp: Thu 2007-12-13 11:38:54 -0500
message:
Support converting standalone tree to lightweight checkout
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 2796.2.25
revision-id:abentley at panoramicfeedback.com-20071212152545-jcka1pitrjwy0dae
parent: abentley at panoramicfeedback.com-20071212151740-z0m40hdji48rh8pm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.reconfigure
timestamp: Wed 2007-12-12 10:25:45 -0500
message:
Avoid destroying shared repositories
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 2796.2.24
revision-id:abentley at panoramicfeedback.com-20071212151740-z0m40hdji48rh8pm
parent: abentley at panoramicfeedback.com-20071212151713-ox5n8rlx8m3nsspy
parent: pqm at pqm.ubuntu.com-20071211175118-s94sizduj201hrs5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.reconfigure
timestamp: Wed 2007-12-12 10:17:40 -0500
message:
Merge bzr.dev
removed:
doc/en/user-reference/index.txt index.txt-20070830033353-ud9e03xsh24053oo-1
added:
doc/en/quick-reference/quick-start-summary.pdf quickstartsummary.pd-20071207005239-it6xmdjml8nxvzgt-1
doc/en/quick-reference/quick-start-summary.png quickstartsummary.pn-20071203142852-hsiybkmh37q5owwe-1
doc/en/tutorials/ docentutorials-20071127235845-bm2lu60bvau1ptmh-1
doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/best_practice_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/central_intro.txt central_intro.txt-20071123055134-k5x4ekduci2lbn36-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/distributed_intro.txt distributed_intro.tx-20071123154453-dk2mjhrg1vpjm5w2-2
doc/en/user-guide/entering_commands.txt using_bazaar.txt-20071114035000-q36a9h57ps06uvnl-6
doc/en/user-guide/getting_help.txt getting_help.txt-20071128000722-ncxiua259xwbdbg7-2
doc/en/user-guide/images/ images-20071114035000-q36a9h57ps06uvnl-3
doc/en/user-guide/images/workflows_centralized.png workflows_centralize-20071114035000-q36a9h57ps06uvnl-8
doc/en/user-guide/images/workflows_centralized.svg workflows_centralize-20071130043324-bhms0cgyphhq1b2x-1
doc/en/user-guide/images/workflows_gatekeeper.png workflows_gatekeeper-20071114035000-q36a9h57ps06uvnl-9
doc/en/user-guide/images/workflows_gatekeeper.svg workflows_gatekeeper-20071130043324-bhms0cgyphhq1b2x-2
doc/en/user-guide/images/workflows_localcommit.png workflows_localcommi-20071114035000-q36a9h57ps06uvnl-10
doc/en/user-guide/images/workflows_localcommit.svg workflows_localcommi-20071130043324-bhms0cgyphhq1b2x-3
doc/en/user-guide/images/workflows_peer.png workflows_peer.png-20071114035000-q36a9h57ps06uvnl-11
doc/en/user-guide/images/workflows_peer.svg workflows_peer.svg-20071130043324-bhms0cgyphhq1b2x-4
doc/en/user-guide/images/workflows_pqm.png workflows_pqm.png-20071114035000-q36a9h57ps06uvnl-12
doc/en/user-guide/images/workflows_pqm.svg workflows_pqm.svg-20071130043324-bhms0cgyphhq1b2x-5
doc/en/user-guide/images/workflows_shared.png workflows_shared.png-20071114035000-q36a9h57ps06uvnl-13
doc/en/user-guide/images/workflows_shared.svg workflows_shared.svg-20071130043324-bhms0cgyphhq1b2x-6
doc/en/user-guide/images/workflows_single.png workflows_single.png-20071114035000-q36a9h57ps06uvnl-14
doc/en/user-guide/images/workflows_single.svg workflows_single.svg-20071130043324-bhms0cgyphhq1b2x-7
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/merging_changes.txt merging_changes.txt-20071122141511-0knao2lklsdsvb1q-3
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
doc/en/user-guide/recording_changes.txt recording_changes.tx-20071121073725-0corxykv5irjal00-4
doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
doc/en/user-guide/reviewing_changes.txt reviewing_changes.tx-20071121073725-0corxykv5irjal00-6
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
doc/en/user-guide/solo_intro.txt solo_workflow.txt-20071121073725-0corxykv5irjal00-7
doc/en/user-guide/starting_a_project.txt starting_a_project.t-20071121073725-0corxykv5irjal00-8
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_checkouts.txt using_checkouts.txt-20071123055134-k5x4ekduci2lbn36-4
doc/en/user-guide/using_gatekeepers.txt using_gatekeepers.tx-20071123154453-dk2mjhrg1vpjm5w2-5
doc/en/user-guide/working_offline_central.txt working_offline_cent-20071123055134-k5x4ekduci2lbn36-5
doc/en/user-guide/writing_a_plugin.txt writing_a_plugin.txt-20071114035000-q36a9h57ps06uvnl-7
renamed:
doc/en/user-guide/centralized_workflow.txt => doc/en/tutorials/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/en/user-guide/tutorial.txt => doc/en/tutorials/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
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/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
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/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/switch.py switch.py-20071116011000-v5lnw7d2wkng9eux-1
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_create_checkout.py test_create_checkout-20070322193723-n2wkp1g03r0404di-1
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_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_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_switch.py test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/quick-reference/quick-start-summary.svg quickstartsummary.sv-20070813143223-5i7bgw7w8s7l3ae2-3
doc/en/user-guide/authentication_conf.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/en/user-guide/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
doc/en/tutorials/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
------------------------------------------------------------
revno: 2796.2.23
revision-id:abentley at panoramicfeedback.com-20071212151713-ox5n8rlx8m3nsspy
parent: abentley at panoramicfeedback.com-20071129173223-vxdci7trlqn5h083
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.reconfigure
timestamp: Wed 2007-12-12 10:17:13 -0500
message:
Add support for reconfiguring repositories into branches or trees
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
=== modified file 'NEWS'
--- a/NEWS 2007-12-14 08:47:17 +0000
+++ b/NEWS 2007-12-14 15:38:28 +0000
@@ -20,6 +20,8 @@
* Merge directives now fetch prerequisites from the target branch if
needed. (Aaron Bentley)
+ * ``reconfigure`` can now convert from repositories. (Aaron Bentley)
+
BUGFIXES:
* Fix Makefile rules for doc generation. (Ian Clatworthy, #175207)
@@ -35,6 +37,9 @@
read the remaining bytes by chunks to avoid overflowing network buffers.
(Vincent Ladeuil, #175886)
+ * ``reconfigure`` is able to convert trees into lightweight checkouts.
+ (Aaron Bentley)
+
INTERNALS:
API BREAKS:
=== modified file 'bzrlib/reconfigure.py'
--- a/bzrlib/reconfigure.py 2007-11-27 19:37:36 +0000
+++ b/bzrlib/reconfigure.py 2007-12-13 16:38:54 +0000
@@ -62,8 +62,6 @@
:param bzrdir: The bzrdir to reconfigure
:raise errors.AlreadyBranch: if bzrdir is already a branch
- :raise errors.ReconfigurationNotSupported: if bzrdir does not contain
- a branch or branch reference
"""
reconfiguration = Reconfigure(bzrdir)
reconfiguration._plan_changes(want_tree=False, want_branch=True,
@@ -78,8 +76,6 @@
:param bzrdir: The bzrdir to reconfigure
:raise errors.AlreadyTree: if bzrdir is already a tree
- :raise errors.ReconfigurationNotSupported: if bzrdir does not contain
- a branch or branch reference
"""
reconfiguration = Reconfigure(bzrdir)
reconfiguration._plan_changes(want_tree=True, want_branch=True,
@@ -95,8 +91,6 @@
:param bzrdir: The bzrdir to reconfigure
:param bound_location: The location the checkout should be bound to.
:raise errors.AlreadyCheckout: if bzrdir is already a checkout
- :raise errors.ReconfigurationNotSupported: if bzrdir does not contain
- a branch or branch reference
"""
reconfiguration = Reconfigure(bzrdir, bound_location)
reconfiguration._plan_changes(want_tree=True, want_branch=True,
@@ -113,8 +107,6 @@
:param bound_location: The location the checkout should be bound to.
:raise errors.AlreadyLightweightCheckout: if bzrdir is already a
lightweight checkout
- :raise errors.ReconfigurationNotSupported: if bzrdir does not contain
- a branch or branch reference
"""
reconfiguration = klass(bzrdir, reference_location)
reconfiguration._plan_changes(want_tree=True, want_branch=False,
@@ -130,17 +122,14 @@
raise errors.ReconfigurationNotSupported(self.bzrdir)
if want_branch and want_reference:
raise errors.ReconfigurationNotSupported(self.bzrdir)
- if (want_branch or want_reference) and (self.local_branch is None and
- self.referenced_branch
- is None):
- raise errors.ReconfigurationNotSupported(self.bzrdir)
if self.repository is None:
if not want_reference:
self._create_repository = True
else:
if want_reference and (self.repository.bzrdir.root_transport.base
== self.bzrdir.root_transport.base):
- self._destroy_repository = True
+ if not self.repository.is_shared():
+ self._destroy_repository = True
if self.referenced_branch is None:
if want_reference:
self._create_reference = True
@@ -168,7 +157,8 @@
"""Return True if changes are planned, False otherwise"""
return (self._unbind or self._bind or self._destroy_tree
or self._create_tree or self._destroy_reference
- or self._create_branch or self._create_repository)
+ or self._create_branch or self._create_repository
+ or self._create_reference)
def _check(self):
"""Raise if reconfiguration would destroy local changes"""
@@ -223,18 +213,20 @@
repo = self.bzrdir.create_repository()
else:
repo = self.repository
- if self._create_branch:
+ if self._create_branch and self.referenced_branch is not None:
repo.fetch(self.referenced_branch.repository,
self.referenced_branch.last_revision())
+ last_revision_info = None
if self._destroy_reference:
- reference_info = self.referenced_branch.last_revision_info()
+ last_revision_info = self.referenced_branch.last_revision_info()
self.bzrdir.destroy_branch()
if self._destroy_branch:
- reference_info = self.local_branch.last_revision_info()
+ last_revision_info = self.local_branch.last_revision_info()
self.bzrdir.destroy_branch()
if self._create_branch:
local_branch = self.bzrdir.create_branch()
- local_branch.set_last_revision_info(*reference_info)
+ if last_revision_info is not None:
+ local_branch.set_last_revision_info(*last_revision_info)
else:
local_branch = self.local_branch
if self._create_reference:
=== modified file 'bzrlib/tests/test_reconfigure.py'
--- a/bzrlib/tests/test_reconfigure.py 2007-11-29 17:32:23 +0000
+++ b/bzrlib/tests/test_reconfigure.py 2007-12-13 16:38:54 +0000
@@ -18,6 +18,7 @@
branch as _mod_branch,
errors,
reconfigure,
+ repository,
tests,
workingtree,
)
@@ -49,8 +50,8 @@
def test_repo_to_branch(self):
repo = self.make_repository('repo')
- self.assertRaises(errors.ReconfigurationNotSupported,
- reconfigure.Reconfigure.to_branch, repo.bzrdir)
+ reconfiguration = reconfigure.Reconfigure.to_branch(repo.bzrdir)
+ reconfiguration.apply()
def test_checkout_to_branch(self):
branch = self.make_branch('branch')
@@ -146,6 +147,24 @@
parent.base)
reconfiguration.apply()
+ def test_tree_to_lightweight_checkout(self):
+ # A tree with no related branches and no supplied bind location cannot
+ # become a checkout
+ parent = self.make_branch('parent')
+
+ tree = self.make_branch_and_tree('tree')
+ reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
+ tree.bzrdir)
+ self.assertRaises(errors.NoBindLocation, reconfiguration.apply)
+ # setting a parent allows it to become a checkout
+ tree.branch.set_parent(parent.base)
+ reconfiguration.apply()
+ # supplying a location allows it to become a checkout
+ tree2 = self.make_branch_and_tree('tree2')
+ reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
+ tree2.bzrdir, parent.base)
+ reconfiguration.apply()
+
def test_checkout_to_checkout(self):
parent = self.make_branch('parent')
checkout = parent.create_checkout('checkout')
@@ -187,3 +206,31 @@
self.assertRaises(errors.AlreadyLightweightCheckout,
reconfigure.Reconfigure.to_lightweight_checkout,
checkout.bzrdir)
+
+ def test_repo_to_tree(self):
+ repo = self.make_repository('repo')
+ reconfiguration = reconfigure.Reconfigure.to_tree(repo.bzrdir)
+ reconfiguration.apply()
+ workingtree.WorkingTree.open('repo')
+
+ def test_shared_repo_to_lightweight_checkout(self):
+ repo = self.make_repository('repo', shared=True)
+ reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
+ repo.bzrdir)
+ self.assertRaises(errors.NoBindLocation, reconfiguration.apply)
+ branch = self.make_branch('branch')
+ reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
+ repo.bzrdir, 'branch')
+ reconfiguration.apply()
+ workingtree.WorkingTree.open('repo')
+ repository.Repository.open('repo')
+
+ def test_unshared_repo_to_lightweight_checkout(self):
+ repo = self.make_repository('repo', shared=False)
+ branch = self.make_branch('branch')
+ reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
+ repo.bzrdir, 'branch')
+ reconfiguration.apply()
+ workingtree.WorkingTree.open('repo')
+ self.assertRaises(errors.NoRepositoryPresent,
+ repository.Repository.open, 'repo')
More information about the bazaar-commits
mailing list