Rev 3359: Reorganize repository acquisition policy in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Apr 10 22:03:58 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3359
revision-id:pqm at pqm.ubuntu.com-20080410210348-pb55271fnuv0huk0
parent: pqm at pqm.ubuntu.com-20080410185541-zm4p6mqzquwg4tcn
parent: aaron at aaronbentley.com-20080410164150-9romxq3u680vikoy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-04-10 22:03:48 +0100
message:
Reorganize repository acquisition policy
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3242.1.1.1.20
revision-id:aaron at aaronbentley.com-20080410164150-9romxq3u680vikoy
parent: aaron at aaronbentley.com-20080410133005-un0zoyew4izc8hfc
parent: aaron at aaronbentley.com-20080410163904-4b7j222by1h0h93d
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Thu 2008-04-10 12:41:50 -0400
message:
Merge from make_working_trees
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
------------------------------------------------------------
revno: 3242.1.1.1.19
revision-id:aaron at aaronbentley.com-20080410133005-un0zoyew4izc8hfc
parent: aaron at aaronbentley.com-20080410062141-xenidxwkte7pgw21
parent: pqm at pqm.ubuntu.com-20080410105350-e0c4d8n5hqgzqzi7
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Thu 2008-04-10 09:30:05 -0400
message:
Merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
------------------------------------------------------------
revno: 3242.1.1.1.18
revision-id:aaron at aaronbentley.com-20080410062141-xenidxwkte7pgw21
parent: aaron at aaronbentley.com-20080410060855-19ea9hcu7dfef3f2
parent: aaron at aaronbentley.com-20080410061949-1xfuy4h0r8lb3nk6
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Thu 2008-04-10 02:21:41 -0400
message:
Merge set_make_workingtrees
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_subsume.py test_subsume.py-20060927040024-tsvh4pchajoayymg-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3242.1.1.1.17
revision-id:aaron at aaronbentley.com-20080410060855-19ea9hcu7dfef3f2
parent: aaron at aaronbentley.com-20080410045807-qcjeqqlgyfwdjqui
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Thu 2008-04-10 02:08:55 -0400
message:
Fix broken tests
modified:
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
------------------------------------------------------------
revno: 3242.1.1.1.16
revision-id:aaron at aaronbentley.com-20080410045807-qcjeqqlgyfwdjqui
parent: aaron at aaronbentley.com-20080410045323-nps4jidz3w7ct1cu
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Thu 2008-04-10 00:58:07 -0400
message:
Remove special-casing of RemoteBzrDir
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3242.1.1.1.15
revision-id:aaron at aaronbentley.com-20080410045323-nps4jidz3w7ct1cu
parent: aaron at aaronbentley.com-20080409202411-7sygk52ahrxvq3pn
parent: aaron at aaronbentley.com-20080410042238-epgsig57rz3bxma8
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Thu 2008-04-10 00:53:23 -0400
message:
Merge make_working_trees
added:
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
bzrlib/tests/test_uncommit.py test_uncommit.py-20080316104338-y3gxu67g5m2qih10-1
bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
bzrlib/transport/nosmart.py nosmart.py-20080402095843-6ib17idympwy1zkr-1
doc/developers/integration.txt integration.txt-20080404022341-2lorxocp1in07zij-1
doc/developers/plugin-api.txt pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
doc/en/admin-guide/ docenadminguide-20080305135054-y7y2c986yf94zljn-1
doc/en/admin-guide/index.txt index.txt-20080305140741-ecw0lap8dxkxc05g-1
renamed:
bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/tests/test_revisionnamespaces.py => bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/_knit_load_data_py.py _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
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/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
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/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-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/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/TestUtil.py TestUtil.py-20050824080200-5f70140a2d938694
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
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/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
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/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-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_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_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_registry.py test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
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_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/test_wsgi.py test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
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/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-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/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/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
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/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/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
------------------------------------------------------------
revno: 3242.1.1.1.14
revision-id:aaron at aaronbentley.com-20080409202411-7sygk52ahrxvq3pn
parent: aaron at aaronbentley.com-20080404201332-hocq2xz101qt2efp
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Wed 2008-04-09 16:24:11 -0400
message:
Update from review comments
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3242.1.1.1.13
revision-id:aaron at aaronbentley.com-20080404201332-hocq2xz101qt2efp
parent: aaron at aaronbentley.com-20080404195722-dcnsw0fekqccpsfy
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Fri 2008-04-04 16:13:32 -0400
message:
Update docs
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3242.1.1.1.12
revision-id:aaron at aaronbentley.com-20080404195722-dcnsw0fekqccpsfy
parent: aaron at aaronbentley.com-20080404193236-4zjl5q8sy3ojj03z
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Fri 2008-04-04 15:57:22 -0400
message:
Get cloning_metadir working properly for old formats
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3242.1.1.1.11
revision-id:aaron at aaronbentley.com-20080404193236-4zjl5q8sy3ojj03z
parent: aaron at aaronbentley.com-20080404184611-zsb8f3bxcictttwb
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Fri 2008-04-04 15:32:36 -0400
message:
Ensure that correct repository format is used when cloning
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3242.1.1.1.10
revision-id:aaron at aaronbentley.com-20080404184611-zsb8f3bxcictttwb
parent: aaron at aaronbentley.com-20080404182645-y1xuun7sslv7vb6q
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Fri 2008-04-04 14:46:11 -0400
message:
Rename RepositoryPolicy.apply to acquire_repository
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3242.1.1.1.9
revision-id:aaron at aaronbentley.com-20080404182645-y1xuun7sslv7vb6q
parent: aaron at aaronbentley.com-20080404173032-owmm4cz5jlb3fpxw
parent: aaron at aaronbentley.com-20080404180004-nsnbu8w3ke4g1k4z
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Fri 2008-04-04 14:26:45 -0400
message:
Clean up TransportConfig and TreeConfig
modified:
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
------------------------------------------------------------
revno: 3242.1.1.1.8
revision-id:aaron at aaronbentley.com-20080404173032-owmm4cz5jlb3fpxw
parent: aaron at aaronbentley.com-20080404171300-880evkvecljzdrz4
parent: aaron at aaronbentley.com-20080404172942-joxvpyazfps3j0gu
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Fri 2008-04-04 13:30:32 -0400
message:
Merge bzrdir-config
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3242.1.1.1.7
revision-id:aaron at aaronbentley.com-20080404171300-880evkvecljzdrz4
parent: aaron at aaronbentley.com-20080404153452-suh7wkr4e6s6mnuv
parent: aaron at aaronbentley.com-20080404171106-7qsjphtlecdq8drb
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Fri 2008-04-04 13:13:00 -0400
message:
Merge bzrdir-config
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3242.1.1.1.6
revision-id:aaron at aaronbentley.com-20080404153452-suh7wkr4e6s6mnuv
parent: aaron at aaronbentley.com-20080404145621-13ezwcdnfnpu2s0o
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Fri 2008-04-04 11:34:52 -0400
message:
Don't try to use a repository policy, when none exists
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3242.1.1.1.5
revision-id:aaron at aaronbentley.com-20080404145621-13ezwcdnfnpu2s0o
parent: aaron at aaronbentley.com-20080404140717-vm1fweqg2temkzh1
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Fri 2008-04-04 10:56:21 -0400
message:
Avoid unnecessary is_shared check
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3242.1.1.1.4
revision-id:aaron at aaronbentley.com-20080404140717-vm1fweqg2temkzh1
parent: aaron at aaronbentley.com-20080404125156-ai48u6jpd8pqb0jo
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Fri 2008-04-04 10:07:17 -0400
message:
Only set working tree policty when specified
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3242.1.1.1.3
revision-id:aaron at aaronbentley.com-20080404125156-ai48u6jpd8pqb0jo
parent: aaron at aaronbentley.com-20080404123010-1a0pts15s7xzhk83
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Fri 2008-04-04 08:51:56 -0400
message:
Restore shared repository flag cloning
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3242.1.1.1.2
revision-id:aaron at aaronbentley.com-20080404123010-1a0pts15s7xzhk83
parent: aaron at aaronbentley.com-20080403193927-sdxgthpn403ovr5m
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Fri 2008-04-04 08:30:10 -0400
message:
Merge policy updates from stacked-policy thread
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3242.1.1.1.1
revision-id:aaron at aaronbentley.com-20080403193927-sdxgthpn403ovr5m
parent: aaron at aaronbentley.com-20080403193754-b84gbqm5r6bnzmzr
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: repository-policy
timestamp: Thu 2008-04-03 15:39:27 -0400
message:
Abstract policy decisions into determine_repository_policy
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2008-04-10 09:14:16 +0000
+++ b/bzrlib/bzrdir.py 2008-04-10 13:30:05 +0000
@@ -180,36 +180,31 @@
even if one is available.
"""
transport.ensure_base()
- result = self._format.initialize_on_transport(transport)
+ result = self.cloning_metadir().initialize_on_transport(transport)
+ repository_policy = None
try:
local_repo = self.find_repository()
except errors.NoRepositoryPresent:
local_repo = None
if local_repo:
# may need to copy content in
- if force_new_repo:
- result_repo = local_repo.clone(
- result,
- revision_id=revision_id)
- result_repo.set_make_working_trees(local_repo.make_working_trees())
- else:
- try:
- result_repo = result.find_repository()
- # fetch content this dir needs.
- result_repo.fetch(local_repo, revision_id=revision_id)
- except errors.NoRepositoryPresent:
- # needed to make one anyway.
- result_repo = local_repo.clone(
- result,
- revision_id=revision_id)
- result_repo.set_make_working_trees(local_repo.make_working_trees())
+ repository_policy = result.determine_repository_policy(
+ force_new_repo)
+ make_working_trees = local_repo.make_working_trees()
+ result_repo = repository_policy.acquire_repository(
+ make_working_trees, local_repo.is_shared())
+ result_repo.fetch(local_repo, revision_id=revision_id)
# 1 if there is a branch present
# make sure its content is available in the target repository
# clone it.
try:
- self.open_branch().clone(result, revision_id=revision_id)
+ local_branch = self.open_branch()
except errors.NotBranchError:
pass
+ else:
+ result_branch = local_branch.clone(result, revision_id=revision_id)
+ if repository_policy is not None:
+ repository_policy.configure_branch(result_branch)
try:
result_repo = result.find_repository()
except errors.NoRepositoryPresent:
@@ -356,15 +351,43 @@
bzrdir._find_or_create_repository(force_new_repo)
return bzrdir.create_branch()
+ def determine_repository_policy(self, force_new_repo=False):
+ """Return an object representing a policy to use.
+
+ This controls whether a new repository is created, or a shared
+ repository used instead.
+ """
+ def repository_policy(found_bzrdir):
+ stop = False
+ # does it have a repository ?
+ try:
+ repository = found_bzrdir.open_repository()
+ except errors.NoRepositoryPresent:
+ repository = None
+ else:
+ if ((found_bzrdir.root_transport.base !=
+ self.root_transport.base) and not repository.is_shared()):
+ repository = None
+ else:
+ stop = True
+ if not stop:
+ return None, False
+ if repository:
+ return UseExistingRepository(repository), True
+ else:
+ return CreateRepository(self), True
+
+ if not force_new_repo:
+ policy = self._find_containing(repository_policy)
+ if policy is not None:
+ return policy
+ return CreateRepository(self)
+
def _find_or_create_repository(self, force_new_repo):
"""Create a new repository if needed, returning the repository."""
- if force_new_repo:
- return self.create_repository()
- try:
- return self.find_repository()
- except errors.NoRepositoryPresent:
- return self.create_repository()
-
+ policy = self.determine_repository_policy(force_new_repo)
+ return policy.acquire_repository()
+
@staticmethod
def create_branch_convenience(base, force_new_repo=False,
force_new_tree=None, format=None,
@@ -508,6 +531,35 @@
"""
raise NotImplementedError(self.destroy_workingtree_metadata)
+ def _find_containing(self, evaluate):
+ """Find something in a containing control directory.
+
+ This method will scan containing control dirs, until it finds what
+ it is looking for, decides that it will never find it, or runs out
+ of containing control directories to check.
+
+ It is used to implement find_repository and
+ determine_repository_policy.
+
+ :param evaluate: A function returning (value, stop). If stop is True,
+ the value will be returned.
+ """
+ found_bzrdir = self
+ while True:
+ result, stop = evaluate(found_bzrdir)
+ if stop:
+ return result
+ next_transport = found_bzrdir.root_transport.clone('..')
+ if (found_bzrdir.root_transport.base == next_transport.base):
+ # top of the file system
+ return None
+ # find the next containing bzrdir
+ try:
+ found_bzrdir = BzrDir.open_containing_from_transport(
+ next_transport)[0]
+ except errors.NotBranchError:
+ return None
+
def find_repository(self):
"""Find the repository that should be used.
@@ -515,35 +567,23 @@
new branches as well as to hook existing branches up to their
repository.
"""
- try:
- return self.open_repository()
- except errors.NoRepositoryPresent:
- pass
- next_transport = self.root_transport.clone('..')
- while True:
- # find the next containing bzrdir
- try:
- found_bzrdir = BzrDir.open_containing_from_transport(
- next_transport)[0]
- except errors.NotBranchError:
- # none found
- raise errors.NoRepositoryPresent(self)
+ def usable_repository(found_bzrdir):
# does it have a repository ?
try:
repository = found_bzrdir.open_repository()
except errors.NoRepositoryPresent:
- next_transport = found_bzrdir.root_transport.clone('..')
- if (found_bzrdir.root_transport.base == next_transport.base):
- # top of the file system
- break
- else:
- continue
- if ((found_bzrdir.root_transport.base ==
- self.root_transport.base) or repository.is_shared()):
- return repository
+ return None, False
+ if found_bzrdir.root_transport.base == self.root_transport.base:
+ return repository, True
+ elif repository.is_shared():
+ return repository, True
else:
- raise errors.NoRepositoryPresent(self)
- raise errors.NoRepositoryPresent(self)
+ return None, True
+
+ found_repo = self._find_containing(usable_repository)
+ if found_repo is None:
+ raise errors.NoRepositoryPresent(self)
+ return found_repo
def get_branch_reference(self):
"""Return the referenced URL for the branch in this bzrdir.
@@ -1010,6 +1050,10 @@
"""Pre-splitout bzrdirs do not suffer from stale locks."""
raise NotImplementedError(self.break_lock)
+ def cloning_metadir(self):
+ """Produce a metadir suitable for cloning with."""
+ return self._format.__class__()
+
def clone(self, url, revision_id=None, force_new_repo=False):
"""See BzrDir.clone()."""
from bzrlib.workingtree import WorkingTreeFormat2
@@ -2609,6 +2653,67 @@
return output
+class RepositoryAcquisitionPolicy(object):
+ """Abstract base class for repository acquisition policies.
+
+ A repository acquisition policy decides how a BzrDir acquires a repository
+ for a branch that is being created. The most basic policy decision is
+ whether to create a new repository or use an existing one.
+ """
+
+ def configure_branch(self, branch):
+ """Apply any configuration data from this policy to the branch.
+
+ Default implementation does nothing.
+ """
+ pass
+
+ def acquire_repository(self, make_working_trees=None, shared=False):
+ """Acquire a repository for this bzrdir.
+
+ Implementations may create a new repository or use a pre-exising
+ repository.
+ :param make_working_trees: If creating a repository, set
+ make_working_trees to this value (if non-None)
+ :param shared: If creating a repository, make it shared if True
+ :return: A repository
+ """
+ raise NotImplemented(RepositoryAcquisitionPolicy.acquire_repository)
+
+
+class CreateRepository(RepositoryAcquisitionPolicy):
+ """A policy of creating a new repository"""
+
+ def __init__(self, bzrdir):
+ RepositoryAcquisitionPolicy.__init__(self)
+ self._bzrdir = bzrdir
+
+ def acquire_repository(self, make_working_trees=None, shared=False):
+ """Implementation of RepositoryAcquisitionPolicy.acquire_repository
+
+ Creates the desired repository in the bzrdir we already have.
+ """
+ repository = self._bzrdir.create_repository(shared=shared)
+ if make_working_trees is not None:
+ repository.set_make_working_trees(make_working_trees)
+ return repository
+
+
+class UseExistingRepository(RepositoryAcquisitionPolicy):
+ """A policy of reusing an existing repository"""
+
+ def __init__(self, repository):
+ RepositoryAcquisitionPolicy.__init__(self)
+ self._repository = repository
+
+ def acquire_repository(self, make_working_trees=None, shared=False):
+ """Implementation of RepositoryAcquisitionPolicy.acquire_repository
+
+ Returns an existing repository to use
+ """
+ return self._repository
+
+
format_registry = BzrDirFormatRegistry()
format_registry.register('weave', BzrDirFormat6,
'Pre-0.8 format. Slower than knit and does not'
=== modified file 'bzrlib/tests/bzrdir_implementations/__init__.py'
--- a/bzrlib/tests/bzrdir_implementations/__init__.py 2007-06-28 06:01:18 +0000
+++ b/bzrlib/tests/bzrdir_implementations/__init__.py 2008-04-09 20:24:11 +0000
@@ -86,8 +86,10 @@
return self.bzrdir
def make_bzrdir(self, relpath, format=None):
+ if format is None:
+ format = self.bzrdir_format
return super(TestCaseWithBzrDir, self).make_bzrdir(
- relpath, format=self.bzrdir_format)
+ relpath, format=format)
def test_suite():
=== modified file 'bzrlib/tests/bzrdir_implementations/test_bzrdir.py'
--- a/bzrlib/tests/bzrdir_implementations/test_bzrdir.py 2008-04-10 09:14:16 +0000
+++ b/bzrlib/tests/bzrdir_implementations/test_bzrdir.py 2008-04-10 13:30:05 +0000
@@ -537,6 +537,20 @@
target.open_repository())
target.open_workingtree().revert()
+ def test_clone_on_transport_preserves_repo_format(self):
+ if self.bzrdir_format == bzrdir.format_registry.make_bzrdir('default'):
+ format = 'knit'
+ else:
+ format = None
+ source_branch = self.make_branch('source', format=format)
+ # Ensure no format data is cached
+ a_dir = bzrlib.branch.Branch.open_from_transport(
+ self.get_transport('source')).bzrdir
+ target_transport = a_dir.root_transport.clone('..').clone('target')
+ target_bzrdir = a_dir.clone_on_transport(target_transport)
+ target_repo = target_bzrdir.open_repository()
+ self.assertEqual(target_repo._format, source_branch.repository._format)
+
def test_revert_inventory(self):
tree = self.make_branch_and_tree('source')
self.build_tree(['source/foo'])
=== modified file 'bzrlib/tests/repository_implementations/test_fetch.py'
--- a/bzrlib/tests/repository_implementations/test_fetch.py 2008-01-02 03:08:59 +0000
+++ b/bzrlib/tests/repository_implementations/test_fetch.py 2008-04-10 06:08:55 +0000
@@ -48,7 +48,7 @@
def test_fetch_knit3(self):
# create a repository of the sort we are testing.
- tree_a = self.make_branch_and_tree('a', '')
+ tree_a = self.make_branch_and_tree('a')
self.build_tree(['a/foo'])
tree_a.add('foo', 'file1')
tree_a.commit('rev1', rev_id='rev1')
@@ -127,7 +127,7 @@
target_repo.get_signature_text('rev1'))
def make_repository_with_one_revision(self):
- wt = self.make_branch_and_tree('source', '')
+ wt = self.make_branch_and_tree('source')
wt.commit('rev1', allow_pointless=True, rev_id='rev1')
return wt.branch.repository
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py 2008-02-13 22:11:40 +0000
+++ b/bzrlib/tests/test_bzrdir.py 2008-04-09 20:24:11 +0000
@@ -454,6 +454,18 @@
branch.bzrdir.open_workingtree()
+class TestRepositoryAcquisitionPolicy(TestCaseWithTransport):
+
+ def test_acquire_repository_standalone(self):
+ """The default acquisition policy should create a standalone branch."""
+ my_bzrdir = self.make_bzrdir('.')
+ repo_policy = my_bzrdir.determine_repository_policy()
+ repo = repo_policy.acquire_repository()
+ self.assertEqual(repo.bzrdir.root_transport.base,
+ my_bzrdir.root_transport.base)
+ self.assertFalse(repo.is_shared())
+
+
class ChrootedTests(TestCaseWithTransport):
"""A support class that provides readonly urls outside the local namespace.
More information about the bazaar-commits
mailing list