Rev 3052: bzr reconfigure can now convert to lightweight checkout in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Nov 29 18:41:08 GMT 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3052
revision-id:pqm at pqm.ubuntu.com-20071129184101-u9506rihe4zbzyyz
parent: pqm at pqm.ubuntu.com-20071129180655-yv661adx0qb6a50z
parent: abentley at panoramicfeedback.com-20071129173223-vxdci7trlqn5h083
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-11-29 18:41:01 +0000
message:
bzr reconfigure can now convert to lightweight checkout
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 2796.2.22
revision-id:abentley at panoramicfeedback.com-20071129173223-vxdci7trlqn5h083
parent: abentley at panoramicfeedback.com-20071127194326-23udmrk6uh4cy3xb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.reconfigure
timestamp: Thu 2007-11-29 12:32:23 -0500
message:
Tweak from review
modified:
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 2796.2.21
revision-id:abentley at panoramicfeedback.com-20071127194326-23udmrk6uh4cy3xb
parent: abentley at panoramicfeedback.com-20071127194032-f51sqjvldlwz7nc1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.reconfigure
timestamp: Tue 2007-11-27 14:43:26 -0500
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2796.2.20
revision-id:abentley at panoramicfeedback.com-20071127194032-f51sqjvldlwz7nc1
parent: abentley at panoramicfeedback.com-20071127193736-fjqqz482w0a6400o
parent: pqm at pqm.ubuntu.com-20071127143838-lkx79x6q91uptc1o
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.reconfigure
timestamp: Tue 2007-11-27 14:40:32 -0500
message:
Merge bzr.dev
removed:
bzrlib/transport/http/_pycurl_errors.py _pycurl_errors.py-20060714003436-4zste49ltg697ft9-1
added:
bzrlib/bisect_multi.py bisect_multi.py-20071005104357-0vymd381la7ew4o1-1
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/switch.py switch.py-20071116011000-v5lnw7d2wkng9eux-1
bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
bzrlib/tests/commands/test_commit.py test_commit.py-20070913161801-ydrx2k5gmv7k7eiu-1
bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
bzrlib/tests/repository_implementations/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
bzrlib/tests/repository_implementations/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/repository_implementations/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
bzrlib/tests/repository_implementations/test_is_write_locked.py test_is_write_locked-20071012063748-vk062lmu683qgbc3-1
bzrlib/tests/test_bisect_multi.py test_bisect_multi.py-20071005104357-0vymd381la7ew4o1-2
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/test_switch.py test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
bzrlib/tests/tree_implementations/test_get_root_id.py test_get_root_id.py-20071026191509-a4conhr43f194avv-1
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/transport/trace.py trace.py-20070828055009-7kt0bbc4t4b92apz-1
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
doc/en/user-guide/authentication_conf.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
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/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
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/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
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/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
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/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lazy_import.py lazy_import.py-20060910203832-f77c54gf3n232za0-1
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
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/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/smart/__init__.py __init__.py-20061101100249-8jwwl0d3jr080zim-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/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-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/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-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_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/blackbox/test_whoami.py test_whoami.py-20060629025641-8h3m2ch7kutqx7ug-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/branch_implementations/test_create_checkout.py test_create_checkout-20070322193723-n2wkp1g03r0404di-1
bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py test_get_revision_id-20070417211641-6kcoj1c704gqqopn-1
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
bzrlib/tests/commands/test_cat.py test_cat.py-20070525170351-vg2apsfb5j413913-1
bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
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
bzrlib/tests/commands/test_merge.py test_merge.py-20070525163813-v8yfs5wu77hjsx0o-1
bzrlib/tests/commands/test_missing.py test_missing.py-20070525171057-qr1z4sleurlp9b5v-1
bzrlib/tests/commands/test_pull.py test_pull.py-20070525144918-cgmunk4ici2krjnd-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/commands/test_update.py test_update.py-20070910091045-8uyp8v73j926l1g2-1
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/per_lock/test_lock.py test_lock.py-20070313190612-mfpoa7t8kvrgrhj2-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-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/repository_implementations/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/tests/test_generate_ids.py test_generate_ids.py-20061102205935-z3do15ipw6m7v26u-2
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
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_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
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_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/workingtree_implementations/test_break_lock.py test_break_lock.py-20060504115740-233e245df546fd42
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_executable.py test_executable.py-20060628162557-tr7h57kl80l3ma8i-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
bzrlib/tests/workingtree_implementations/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-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/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/fakevfat.py fakevfat.py-20060407072414-d59939fa1d6c79d9
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
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/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tuned_gzip.py tuned_gzip.py-20060407014720-5aadc518e928e8d2
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weavefile.py weavefile.py-20050629135233-2ffe0200f103f6c2
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/en/user-guide/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
generate_docs.py bzrinfogen.py-20051211224525-78e7c14f2c955e55
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
------------------------------------------------------------
revno: 2796.2.19
revision-id:abentley at panoramicfeedback.com-20071127193736-fjqqz482w0a6400o
parent: abentley at panoramicfeedback.com-20070917124656-j3hhxhx9igy11mfc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.reconfigure
timestamp: Tue 2007-11-27 14:37:36 -0500
message:
Support reconfigure --lightweight-checkout
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
=== modified file 'NEWS'
--- a/NEWS 2007-11-29 18:06:55 +0000
+++ b/NEWS 2007-11-29 18:41:01 +0000
@@ -36,6 +36,9 @@
accordingly. This command was previously part of the BzrTools plug-in.
(Ian Clatworthy, Aaron Bentley, David Allouche)
+ * ``reconfigure`` command can now convert branches, trees, or checkouts to
+ lightweight checkouts. (Aaron Bentley)
+
PERFORMANCE:
* Commit updates the state of the working tree via a delta rather than
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2007-11-28 17:27:10 +0000
+++ b/bzrlib/builtins.py 2007-11-29 18:41:01 +0000
@@ -4300,7 +4300,9 @@
value_switches=True, enum_switch=False,
branch='Reconfigure to a branch.',
tree='Reconfigure to a tree.',
- checkout='Reconfigure to a checkout.'),
+ checkout='Reconfigure to a checkout.',
+ lightweight_checkout='Reconfigure to a lightweight'
+ ' checkout.'),
Option('bind-to', help='Branch to bind checkout to.',
type=str),
Option('force',
@@ -4319,6 +4321,9 @@
elif target_type == 'checkout':
reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
bind_to)
+ elif target_type == 'lightweight-checkout':
+ reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
+ directory, bind_to)
reconfiguration.apply(force)
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2007-11-28 09:45:14 +0000
+++ b/bzrlib/bzrdir.py 2007-11-29 18:41:01 +0000
@@ -245,6 +245,10 @@
format = BzrDirFormat.get_default_format()
return format.initialize_on_transport(t)
+ def destroy_repository(self):
+ """Destroy the repository in this BzrDir"""
+ raise NotImplementedError(self.destroy_repository)
+
def create_branch(self):
"""Create a branch in this BzrDir.
@@ -931,6 +935,10 @@
raise errors.IncompatibleFormat('shared repository', self._format)
return self.open_repository()
+ def destroy_repository(self):
+ """See BzrDir.destroy_repository."""
+ raise errors.UnsupportedOperation(self.destroy_repository, self)
+
def create_workingtree(self, revision_id=None, from_branch=None):
"""See BzrDir.create_workingtree."""
# this looks buggy but is not -really-
@@ -1109,6 +1117,10 @@
"""See BzrDir.create_repository."""
return self._format.repository_format.initialize(self, shared)
+ def destroy_repository(self):
+ """See BzrDir.destroy_repository."""
+ self.transport.delete_tree('repository')
+
def create_workingtree(self, revision_id=None, from_branch=None):
"""See BzrDir.create_workingtree."""
return self._format.workingtree_format.initialize(
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2007-11-28 17:27:10 +0000
+++ b/bzrlib/errors.py 2007-11-29 18:41:01 +0000
@@ -2442,6 +2442,11 @@
_fmt = "'%(display_url)s' is already a checkout."
+class AlreadyLightweightCheckout(BzrDirError):
+
+ _fmt = "'%(display_url)s' is already a lightweight checkout."
+
+
class ReconfigurationNotSupported(BzrDirError):
_fmt = "Requested reconfiguration of '%(display_url)s' is not supported."
=== modified file 'bzrlib/reconfigure.py'
--- a/bzrlib/reconfigure.py 2007-09-14 14:45:55 +0000
+++ b/bzrlib/reconfigure.py 2007-11-27 19:37:36 +0000
@@ -48,10 +48,13 @@
self._unbind = False
self._bind = False
self._destroy_reference = False
+ self._create_reference = False
+ self._destroy_branch = False
self._create_branch = False
self._destroy_tree = False
self._create_tree = False
self._create_repository = False
+ self._destroy_repository = False
@staticmethod
def to_branch(bzrdir):
@@ -64,7 +67,7 @@
"""
reconfiguration = Reconfigure(bzrdir)
reconfiguration._plan_changes(want_tree=False, want_branch=True,
- want_bound=False)
+ want_bound=False, want_reference=False)
if not reconfiguration.changes_planned():
raise errors.AlreadyBranch(bzrdir)
return reconfiguration
@@ -80,7 +83,7 @@
"""
reconfiguration = Reconfigure(bzrdir)
reconfiguration._plan_changes(want_tree=True, want_branch=True,
- want_bound=False)
+ want_bound=False, want_reference=False)
if not reconfiguration.changes_planned():
raise errors.AlreadyTree(bzrdir)
return reconfiguration
@@ -97,24 +100,58 @@
"""
reconfiguration = Reconfigure(bzrdir, bound_location)
reconfiguration._plan_changes(want_tree=True, want_branch=True,
- want_bound=True)
+ want_bound=True, want_reference=False)
if not reconfiguration.changes_planned():
raise errors.AlreadyCheckout(bzrdir)
return reconfiguration
- def _plan_changes(self, want_tree, want_branch, want_bound):
+ @classmethod
+ def to_lightweight_checkout(klass, bzrdir, reference_location=None):
+ """Make a Reconfiguration to convert bzrdir into a lightweight checkout
+
+ :param bzrdir: The bzrdir to reconfigure
+ :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,
+ want_bound=False, want_reference=True)
+ if not reconfiguration.changes_planned():
+ raise errors.AlreadyLightweightCheckout(bzrdir)
+ return reconfiguration
+
+ def _plan_changes(self, want_tree, want_branch, want_bound,
+ want_reference):
"""Determine which changes are needed to assume the configuration"""
+ if not want_branch and not want_reference:
+ 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:
- self._create_repository = True
+ 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 self.referenced_branch is None:
+ if want_reference:
+ self._create_reference = True
+ else:
+ if not want_reference:
+ self._destroy_reference = True
if self.local_branch is None:
if want_branch is True:
- if self.referenced_branch is not None:
- self._destroy_reference = True
- self._create_branch = True
- if want_bound:
- self._bind = True
- else:
- raise errors.ReconfigurationNotSupported(self.bzrdir)
+ self._create_branch = True
+ if want_bound:
+ self._bind = True
else:
if want_bound:
if self.local_branch.get_bound_location() is None:
@@ -141,18 +178,22 @@
raise errors.UncommittedChanges(self.tree)
def _select_bind_location(self):
- """Select a location to bind to.
+ """Select a location to bind or create a reference to.
Preference is:
1. user specified location
2. branch reference location (it's a kind of bind location)
- 3. previous bind location (it was a good choice once)
- 4. push location (it's writeable, so committable)
- 5. parent location (it's pullable, so update-from-able)
+ 3. current bind location
+ 4. previous bind location (it was a good choice once)
+ 5. push location (it's writeable, so committable)
+ 6. parent location (it's pullable, so update-from-able)
"""
if self.new_bound_location is not None:
return self.new_bound_location
if self.local_branch is not None:
+ bound = self.local_branch.get_bound_location()
+ if bound is not None:
+ return bound
old_bound = self.local_branch.get_old_bound_location()
if old_bound is not None:
return old_bound
@@ -188,11 +229,18 @@
if self._destroy_reference:
reference_info = self.referenced_branch.last_revision_info()
self.bzrdir.destroy_branch()
+ if self._destroy_branch:
+ reference_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)
else:
local_branch = self.local_branch
+ if self._create_reference:
+ reference_branch = branch.Branch.open(self._select_bind_location())
+ format = branch.BranchReferenceFormat().initialize(self.bzrdir,
+ reference_branch)
if self._destroy_tree:
self.bzrdir.destroy_workingtree()
if self._create_tree:
@@ -202,3 +250,7 @@
if self._bind:
bind_location = self._select_bind_location()
local_branch.bind(branch.Branch.open(bind_location))
+ if self._destroy_repository:
+ if self._create_reference:
+ reference_branch.repository.fetch(self.repository)
+ self.bzrdir.destroy_repository()
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2007-11-27 23:39:22 +0000
+++ b/bzrlib/remote.py 2007-11-29 18:41:01 +0000
@@ -85,6 +85,11 @@
self._real_bzrdir.create_repository(shared=shared)
return self.open_repository()
+ def destroy_repository(self):
+ """See BzrDir.destroy_repository"""
+ self._ensure_real()
+ self._real_bzrdir.destroy_repository()
+
def create_branch(self):
self._ensure_real()
real_branch = self._real_bzrdir.create_branch()
=== modified file 'bzrlib/tests/blackbox/test_reconfigure.py'
--- a/bzrlib/tests/blackbox/test_reconfigure.py 2007-09-22 06:08:35 +0000
+++ b/bzrlib/tests/blackbox/test_reconfigure.py 2007-11-29 17:32:23 +0000
@@ -61,3 +61,8 @@
branch = self.make_branch('branch')
self.run_bzr_error(['No target configuration specified'],
'reconfigure', working_dir='branch')
+
+ def test_checkout_to_lightweight_checkout(self):
+ branch = self.make_branch('branch')
+ checkout = branch.create_checkout('checkout')
+ self.run_bzr('reconfigure --lightweight-checkout checkout')
=== modified file 'bzrlib/tests/bzrdir_implementations/test_bzrdir.py'
--- a/bzrlib/tests/bzrdir_implementations/test_bzrdir.py 2007-11-26 20:30:08 +0000
+++ b/bzrlib/tests/bzrdir_implementations/test_bzrdir.py 2007-11-27 19:40:32 +0000
@@ -241,6 +241,18 @@
bzrdir.create_branch()
bzrdir.open_branch()
+ def test_destroy_repository(self):
+ repo = self.make_repository('repository')
+ bzrdir = repo.bzrdir
+ try:
+ bzrdir.destroy_repository()
+ except (errors.UnsupportedOperation, errors.TransportNotPossible):
+ raise TestNotApplicable('Format does not support destroying'
+ ' repository')
+ self.assertRaises(errors.NoRepositoryPresent, bzrdir.open_repository)
+ bzrdir.create_repository()
+ bzrdir.open_repository()
+
def test_open_workingtree_raises_no_working_tree(self):
"""BzrDir.open_workingtree() should raise NoWorkingTree (rather than
e.g. NotLocalUrl) if there is no working tree.
=== modified file 'bzrlib/tests/test_reconfigure.py'
--- a/bzrlib/tests/test_reconfigure.py 2007-09-13 01:54:20 +0000
+++ b/bzrlib/tests/test_reconfigure.py 2007-11-29 17:32:23 +0000
@@ -111,9 +111,12 @@
branch.set_push_location('sftp://push')
self.assertEqual('sftp://push',
reconfiguration._select_bind_location())
- branch.set_bound_location('bzr:old-bound')
+ branch.set_bound_location('bzr://foo/old-bound')
branch.set_bound_location(None)
- self.assertEqual('bzr:old-bound',
+ self.assertEqual('bzr://foo/old-bound',
+ reconfiguration._select_bind_location())
+ branch.set_bound_location('bzr://foo/cur-bound')
+ self.assertEqual('bzr://foo/cur-bound',
reconfiguration._select_bind_location())
reconfiguration.new_bound_location = 'ftp://user-specified'
self.assertEqual('ftp://user-specified',
@@ -148,3 +151,39 @@
checkout = parent.create_checkout('checkout')
self.assertRaises(errors.AlreadyCheckout,
reconfigure.Reconfigure.to_checkout, checkout.bzrdir)
+
+ def test_checkout_to_lightweight(self):
+ parent = self.make_branch('parent')
+ checkout = parent.create_checkout('checkout')
+ checkout.commit('test', rev_id='new-commit', local=True)
+ reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
+ checkout.bzrdir)
+ reconfiguration.apply()
+ wt = checkout.bzrdir.open_workingtree()
+ self.assertTrue(parent.repository.has_same_location(
+ wt.branch.repository))
+ parent.repository.get_revision('new-commit')
+ self.assertRaises(errors.NoRepositoryPresent,
+ checkout.bzrdir.open_repository)
+
+ def test_branch_to_lightweight_checkout(self):
+ parent = self.make_branch('parent')
+ child = parent.bzrdir.sprout('child').open_workingtree()
+ child.commit('test', rev_id='new-commit')
+ child.bzrdir.destroy_workingtree()
+ reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
+ child.bzrdir)
+ reconfiguration.apply()
+ wt = child.bzrdir.open_workingtree()
+ self.assertTrue(parent.repository.has_same_location(
+ wt.branch.repository))
+ parent.repository.get_revision('new-commit')
+ self.assertRaises(errors.NoRepositoryPresent,
+ child.bzrdir.open_repository)
+
+ def test_lightweight_checkout_to_lightweight_checkout(self):
+ parent = self.make_branch('parent')
+ checkout = parent.create_checkout('checkout', lightweight=True)
+ self.assertRaises(errors.AlreadyLightweightCheckout,
+ reconfigure.Reconfigure.to_lightweight_checkout,
+ checkout.bzrdir)
More information about the bazaar-commits
mailing list