Rev 4038: (robertc) Use a HPSS verb to create Branch objects on bzr:// servers. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Feb 24 09:53:08 GMT 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4038
revision-id: pqm at pqm.ubuntu.com-20090224095304-uk12twrtk4u1mkd1
parent: pqm at pqm.ubuntu.com-20090224073648-8cdhj9m2zsab8hx8
parent: robertc at robertcollins.net-20090224091304-k97x0yqk5yjy8jbl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-02-24 09:53:04 +0000
message:
(robertc) Use a HPSS verb to create Branch objects on bzr:// servers.
(Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 4032.3.6
revision-id: robertc at robertcollins.net-20090224091304-k97x0yqk5yjy8jbl
parent: robertc at robertcollins.net-20090224084758-q4wqd61z7qryuxud
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2009-02-24 20:13:04 +1100
message:
Fix test_source errors.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
------------------------------------------------------------
revno: 4032.3.5
revision-id: robertc at robertcollins.net-20090224084758-q4wqd61z7qryuxud
parent: robertc at robertcollins.net-20090224080917-9k7ib4oj1godlp3k
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2009-02-24 19:47:58 +1100
message:
Move BzrBranch._push_should_merge_tags to Branch.
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 4032.3.4
revision-id: robertc at robertcollins.net-20090224080917-9k7ib4oj1godlp3k
parent: robertc at robertcollins.net-20090224060501-u2qq414byirhfggj
parent: pqm at pqm.ubuntu.com-20090224073648-8cdhj9m2zsab8hx8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2009-02-24 19:09:17 +1100
message:
Merge bzr (resolve conflicts).
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/_patiencediff_py.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_add.py bench_add.py-20060516064526-6342399b2967266c
bzrlib/benchmarks/bench_bench.py bench_bench.py-20060609084943-2lv2wsi61vhkmj7b-1
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_info.py bench_info.py-20060719045551-x5ixdrwbw57cg19z-1
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_pack.py bench_pack.py-20070903042947-0wphp878xr6wkw7t-1
bzrlib/benchmarks/bench_sftp.py bench_sftp.py-20060810114659-67c1edb27503ebde
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/benchmarks/bench_transform.py bench_transform.py-20060525041052-ysn0hlw94gcc57lm-1
bzrlib/benchmarks/bench_workingtree.py bench_workingtree.py-20060527061822-cxrgsa9ax2q4d82q-1
bzrlib/benchmarks/tree_creator/__init__.py __init__.py-20060815024128-b16a7pn542u6b13k-4
bzrlib/benchmarks/tree_creator/heavily_merged.py heavily_merged.py-20060815024128-b16a7pn542u6b13k-3
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/bisect_multi.py bisect_multi.py-20071005104357-0vymd381la7ew4o1-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cache_utf8.py cache_utf8.py-20060810004311-x4cph46la06h9azm-1
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/decorators.py decorators.py-20060112082512-6bfc2d882df1698d
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/email_message.py email_message.py-20070718143823-660zfcl54xi1v65u-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/foreign.py foreign.py-20081112170002-olsxmandkk8qyfuq-1
bzrlib/generate_ids.py generate_ids.py-20061102205935-z3do15ipw6m7v26u-1
bzrlib/globbing.py glob.py-20061113075651-q63o2v35fm2ydk9x-1
bzrlib/gpg.py gpg.py-20051017065112-8654536d415dacc6
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/identitymap.py identitymap.py-20051007040721-83e837d831a6636a
bzrlib/ignores.py ignores.py-20060712153832-2von9l0t7p43ixsv-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inter.py inter.py-20060302012326-a57300cb382c618f
bzrlib/intset.py intset.py-20050717175247-81cd658f9aaa2731
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/iterablefile.py iterablefile.py-20051225230610-c93e5550a82115ed
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lazy_import.py lazy_import.py-20060910203832-f77c54gf3n232za0-1
bzrlib/lazy_regex.py lazy_regex.py-20061009091222-fyettq6z5qomdl9e-1
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
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/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/patch.py patch.py-20050513021216-ad183543f56ee2e5
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
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/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
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/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/shellcomplete.py shellcomplete.py-20050822153127-3be115ff5e70fc39
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/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/message.py message.py-20080222013625-ncqmh3nrxjkxab87-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/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/text.py text.py-20050928201105-c26468dcb5d9b18b
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/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/EncodingAdapter.py EncodingAdapter.py-20060113032051-4d7e1d8c1e38b4a1
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_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_aliases.py test_aliases.py-20060210230318-f0c08c9294dbfae1
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
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_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_ignored.py test_ignored.py-20060518234732-373c9c3035c3558f
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_join.py test_join.py-20060928210902-95dkqa6boh8uq92b-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_modified.py test_modified.py-20080424085848-nwqjenan4dq2vq3w-1
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_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
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_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
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_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_whoami.py test_whoami.py-20060629025641-8h3m2ch7kutqx7ug-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
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_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_http.py test_http.py-20060731224648-2eef7ae5yja95rya-1
bzrlib/tests/branch_implementations/test_last_revision_info.py test_last_revision_i-20070201133317-51mzi40m8hv1i0i9-1
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
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_tags.py test_tags.py-20070212110545-w2s799hm2jlbsmg5-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
bzrlib/tests/per_repository/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/per_repository/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_api.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/tests/test_atomicfile.py test_atomicfile.py-20060809005022-s7psq6himv0hpm3v-1
bzrlib/tests/test_bisect_multi.py test_bisect_multi.py-20071005104357-0vymd381la7ew4o1-2
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_cache_utf8.py test_cache_utf8.py-20060810004311-x4cph46la06h9azm-2
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_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
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_extract.py test_extract.py-20061002214140-qdnnm67q1ov6x6pd-1
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_foreign.py test_foreign.py-20081125004048-ywb901edgp9lluxo-1
bzrlib/tests/test_generate_ids.py test_generate_ids.py-20061102205935-z3do15ipw6m7v26u-2
bzrlib/tests/test_globbing.py test_glob.py-20061113075651-q63o2v35fm2ydk9x-2
bzrlib/tests/test_gpg.py testgpg.py-20051017042228-9276cd40a784c93c
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-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_identitymap.py testidentitymap.py-20051007040721-37936d473bd1ac51
bzrlib/tests/test_ignores.py test_ignores.py-20060712172354-vqq9ln0t8di27v53-1
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
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_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
bzrlib/tests/test_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
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_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
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_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_rio.py test_rio.py-20051128032247-dcd1082dfc86d3d3
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_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_subsume.py test_subsume.py-20060927040024-tsvh4pchajoayymg-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_transactions.py testtransaction.py-20051006222840-1f55858f890d4b0a
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_transport_log.py test_transport_log.p-20080902041816-vh8x5yt5nvdzvew3-3
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/test_treebuilder.py test_treebuilder.py-20060907214856-4omn6hf1u7fvrart-2
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_tuned_gzip.py test_tuned_gzip.py-20060418042056-c576dfc708984968
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
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_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
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_wsgi.py test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/tree_implementations/test_walkdirs.py test_walkdirs.py-20060729160421-gmjnkotqgxdh98ce-1
bzrlib/tests/treeshape.py treeshape.py-20051004094628-312a98f0194306a8
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_add.py test_add.py-20070226165239-4vo178spkrnhavc7-1
bzrlib/tests/workingtree_implementations/test_add_reference.py test_add_reference.p-20061211024451-yo9i1691dgbv1eyn-1
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/workingtree_implementations/test_changes_from.py test_delta.py-20060721145444-xlj6hoiipa8ekkwj-1
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_flush.py test_flush.py-20061005073432-585uyj0sua6r7i9v-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
bzrlib/tests/workingtree_implementations/test_is_control_filename.py test_is_control_filename.py-20060216024958-f5afdebb2fa36418
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_paths2ids.py test_paths2ids.py-20070222011621-kesvovdwm69nndtx-1
bzrlib/tests/workingtree_implementations/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
bzrlib/tests/workingtree_implementations/test_read_working_inventory.py test_read_working_in-20061005073432-585uyj0sua6r7i9v-2
bzrlib/tests/workingtree_implementations/test_revision_tree.py test_revision_tree.p-20060908041847-n15ngjoxpivwls0v-2
bzrlib/tests/workingtree_implementations/test_set_root_id.py test_set_root_id.py-20061004073850-0r1c7qikmnkb8m9k-1
bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/tests/workingtree_implementations/test_views.py test_views.py-20080729134135-v4zjnb85eu9srl80-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/textfile.py textfile.py-20060415001558-9cc2f3652ca99f97
bzrlib/textinv.py textinv.py-20050411024435-e3898231b7d1897b26c38878
bzrlib/textmerge.py textmerge.py-20060408064938-a5d5c009e64a3a25
bzrlib/textui.py textui.py-20050309040759-5d0cebe09c528e7d
bzrlib/timestamp.py timestamp.py-20070306142322-ttbb9oulf3jotljd-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transactions.py transactions.py-20051007010900-f1313d53cf58e223
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/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/fakevfat.py fakevfat.py-20060407072414-d59939fa1d6c79d9
bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/readonly.py readonly.py-20060120032407-66d3166c39ffdc79
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/transport/trace.py trace.py-20070828055009-7kt0bbc4t4b92apz-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/treebuilder.py treebuilder.py-20060907214856-4omn6hf1u7fvrart-1
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/tuned_gzip.py tuned_gzip.py-20060407014720-5aadc518e928e8d2
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/simplemapi.py simplemapi.py-20070810174811-ievl23nziuiq2k3m-1
bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/views.py views.py-20080729082027-1ouh6t9cdobc0eea-1
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/xml8.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 4032.3.3
revision-id: robertc at robertcollins.net-20090224060501-u2qq414byirhfggj
parent: robertc at robertcollins.net-20090224053717-sau62hnxgo2f1pzr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Tue 2009-02-24 17:05:01 +1100
message:
Use the same logic push does to avoid tags operations when pushing new branches.
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 4032.3.2
revision-id: robertc at robertcollins.net-20090224053717-sau62hnxgo2f1pzr
parent: robertc at robertcollins.net-20090223051205-92ypm6chik138tpy
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Tue 2009-02-24 16:37:17 +1100
message:
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 4032.3.1
revision-id: robertc at robertcollins.net-20090223051205-92ypm6chik138tpy
parent: pqm at pqm.ubuntu.com-20090223012623-0epa5dpnb7sk0tef
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Mon 2009-02-23 16:12:05 +1100
message:
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
=== modified file 'NEWS'
--- a/NEWS 2009-02-24 07:36:48 +0000
+++ b/NEWS 2009-02-24 08:09:17 +0000
@@ -81,6 +81,13 @@
INTERNALS:
+ * Branch and Repository creation on a bzr+ssh://server are now done
+ via RPC calls rather than VFS calls, reducing round trips for
+ pushing new branches substantially. (Robert Collins)
+
+ * ``BzrDirFormat.__str__`` now uses the human readable description
+ rather than the sometimes-absent disk label. (Robert Collins)
+
* ``bzrlib.fetch`` is now composed of a sender and a sink component
allowing for decoupling over a network connection. Fetching into
a RemoteRepository uses this to stream the operation.
@@ -92,13 +99,13 @@
* ``bzrlib.tests.run_suite`` accepts a runner_class parameter
supporting the use of different runners. (Robert Collins)
- * Creating a repository on a bzr+ssh:// server will now make a single
- call rather than many VFS calls. (Robert Collins)
-
* New hook Commands['extend_command'] to allow plugins to access a
command object before the command is run (or help generated from
it), without overriding the command. (Robert Collins)
+ * ``RemoteBranchFormat`` no longer claims to have a disk format string.
+ (Robert Collins)
+
* ``Repository`` objects now have ``suspend_write_group`` and
``resume_write_group`` methods. These are currently only useful
with pack repositories. (Andrew Bennetts, Robert Collins)
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py 2009-02-23 18:19:13 +0000
+++ b/bzrlib/branch.py 2009-02-24 08:47:58 +0000
@@ -45,6 +45,7 @@
from bzrlib.decorators import needs_read_lock, needs_write_lock
from bzrlib.hooks import Hooks
+from bzrlib import registry
from bzrlib.symbol_versioning import (
deprecated_in,
deprecated_method,
@@ -147,6 +148,14 @@
possible_transports)
return control.open_branch(), relpath
+ def _push_should_merge_tags(self):
+ """Should _basic_push merge this branch's tags into the target?
+
+ The default implementation returns False if this branch has no tags,
+ and True the rest of the time. Subclasses may override this.
+ """
+ return self.tags.supports_tags() and self.tags.get_tag_dict()
+
def get_config(self):
return BranchConfig(self)
@@ -972,7 +981,8 @@
else:
if parent:
destination.set_parent(parent)
- self.tags.merge_to(destination.tags)
+ if self._push_should_merge_tags():
+ self.tags.merge_to(destination.tags)
@needs_read_lock
def check(self):
@@ -1258,6 +1268,16 @@
"""
return True
+ def network_name(self):
+ """A simple byte string uniquely identifying this format for RPC calls.
+
+ MetaDir branch formats use their disk format string to identify the
+ repository over the wire. All in one formats such as bzr < 0.8, and
+ foreign formats like svn/git and hg should use some marker which is
+ unique and immutable.
+ """
+ raise NotImplementedError(self.network_name)
+
def open(self, a_bzrdir, _found=False):
"""Return the branch object for a_bzrdir
@@ -1268,7 +1288,10 @@
@classmethod
def register_format(klass, format):
+ """Register a metadir format."""
klass._formats[format.get_format_string()] = format
+ # Metadir formats have a network name of their format string.
+ network_format_registry.register(format.get_format_string(), format)
@classmethod
def set_default_format(klass, format):
@@ -1283,7 +1306,7 @@
del klass._formats[format.get_format_string()]
def __str__(self):
- return self.get_format_string().rstrip()
+ return self.get_format_description().rstrip()
def supports_tags(self):
"""True if this format supports tags stored in the branch"""
@@ -1441,6 +1464,10 @@
super(BzrBranchFormat4, self).__init__()
self._matchingbzrdir = bzrdir.BzrDirFormat6()
+ def network_name(self):
+ """The network name for this format is the control dirs disk label."""
+ return self._matchingbzrdir.get_format_string()
+
def open(self, a_bzrdir, _found=False):
"""Return the branch object for a_bzrdir
@@ -1466,6 +1493,13 @@
"""What class to instantiate on open calls."""
raise NotImplementedError(self._branch_class)
+ def network_name(self):
+ """A simple byte string uniquely identifying this format for RPC calls.
+
+ Metadir branch formats use their format string.
+ """
+ return self.get_format_string()
+
def open(self, a_bzrdir, _found=False):
"""Return the branch object for a_bzrdir.
@@ -1688,6 +1722,15 @@
return result
+network_format_registry = registry.FormatRegistry()
+"""Registry of formats indexed by their network name.
+
+The network name for a repository format is an identifier that can be used when
+referring to formats with smart server operations. See
+BranchFormat.network_name() for more detail.
+"""
+
+
# formats which have no format string are not discoverable
# and not independently creatable, so are not registered.
__format5 = BzrBranchFormat5()
@@ -1699,7 +1742,10 @@
BranchFormat.register_format(__format7)
BranchFormat.set_default_format(__format6)
_legacy_formats = [BzrBranchFormat4(),
- ]
+ ]
+network_format_registry.register(
+ _legacy_formats[0].network_name(), _legacy_formats[0])
+
class BzrBranch(Branch):
"""A branch stored in the actual filesystem.
@@ -2035,14 +2081,6 @@
result.new_revno, result.new_revid = target.last_revision_info()
return result
- def _push_should_merge_tags(self):
- """Should _basic_push merge this branch's tags into the target?
-
- The default implementation returns False if this branch has no tags,
- and True the rest of the time. Subclasses may override this.
- """
- return self.tags.supports_tags() and self.tags.get_tag_dict()
-
def get_parent(self):
"""See Branch.get_parent."""
parent = self._get_parent_location()
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2009-02-23 15:42:47 +0000
+++ b/bzrlib/bzrdir.py 2009-02-24 09:13:04 +0000
@@ -1850,7 +1850,7 @@
def __str__(self):
# Trim the newline
- return self.get_format_string().rstrip()
+ return self.get_format_description().rstrip()
def _supply_sub_formats_to(self, other_format):
"""Give other_format the same values for sub formats as this has.
@@ -2084,8 +2084,9 @@
# target doesn't support stacking. So force a branch that *can*
# support stacking.
from bzrlib.branch import BzrBranchFormat7
- self._branch_format = BzrBranchFormat7()
- mutter("using %r for stacking" % (self._branch_format,))
+ branch_format = BzrBranchFormat7()
+ self.set_branch_format(branch_format)
+ mutter("using %r for stacking" % (branch_format,))
from bzrlib.repofmt import pack_repo
if self.repository_format.rich_root_data:
bzrdir_format_name = '1.6.1-rich-root'
@@ -2699,6 +2700,9 @@
def get_format_description(self):
return 'bzr remote bzrdir'
+ def get_format_string(self):
+ raise NotImplementedError(self.get_format_string)
+
@classmethod
def probe_transport(klass, transport):
"""Return a RemoteBzrDirFormat object if it looks possible."""
@@ -2764,6 +2768,16 @@
result.rich_root_data = custom_format.rich_root_data
return result
+ def get_branch_format(self):
+ result = BzrDirMetaFormat1.get_branch_format(self)
+ if not isinstance(result, remote.RemoteBranchFormat):
+ new_result = remote.RemoteBranchFormat()
+ new_result._custom_format = result
+ # cache the result
+ self.set_branch_format(new_result)
+ result = new_result
+ return result
+
repository_format = property(__return_repository_format,
BzrDirMetaFormat1._set_repository_format) #.im_func)
=== modified file 'bzrlib/push.py'
--- a/bzrlib/push.py 2009-01-17 01:30:58 +0000
+++ b/bzrlib/push.py 2009-02-24 08:09:17 +0000
@@ -103,6 +103,8 @@
# all of the dependent branches, etc.
dir_to = br_from.bzrdir.clone_on_transport(to_transport,
revision_id=revision_id, stacked_on=stacked_on)
+ # XXX: Fix this API to allow getting the branch back from the clone
+ # call. Or something. 20090224 RBC/spiv.
br_to = dir_to.open_branch()
# TODO: Some more useful message about what was copied
try:
=== modified file 'bzrlib/registry.py'
--- a/bzrlib/registry.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/registry.py 2009-02-24 09:13:04 +0000
@@ -231,3 +231,30 @@
default_key = property(_get_default_key, _set_default_key,
doc="Current value of the default key."
" Can be set to any existing key.")
+
+
+class FormatRegistry(Registry):
+ """Registry specialised for handling formats."""
+
+ def __init__(self, other_registry=None):
+ Registry.__init__(self)
+ self._other_registry = other_registry
+
+ def register_lazy(self, key, module_name, member_name,
+ help=None, info=None,
+ override_existing=False):
+ # Overridden to allow capturing registrations to two seperate
+ # registries in a single call.
+ Registry.register_lazy(self, key, module_name, member_name,
+ help=help, info=info, override_existing=override_existing)
+ if self._other_registry is not None:
+ self._other_registry.register_lazy(key, module_name, member_name,
+ help=help, info=info, override_existing=override_existing)
+
+ def get(self, format_string):
+ r = Registry.get(self, format_string)
+ if callable(r):
+ r = r()
+ return r
+
+
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/remote.py 2009-02-24 08:09:17 +0000
@@ -70,6 +70,17 @@
except errors.ErrorFromSmartServer, err:
self._translate_error(err, **err_context)
+
+def response_tuple_to_repo_format(response):
+ """Convert a response tuple describing a repository format to a format."""
+ format = RemoteRepositoryFormat()
+ format.rich_root_data = (response[0] == 'yes')
+ format.supports_tree_reference = (response[1] == 'yes')
+ format.supports_external_lookups = (response[2] == 'yes')
+ format._network_name = response[3]
+ return format
+
+
# Note: RemoteBzrDirFormat is in bzrdir.py
class RemoteBzrDir(BzrDir, _RpcHelper):
@@ -343,11 +354,7 @@
return self._vfs_initialize(a_bzrdir, shared)
else:
# Turn the response into a RemoteRepository object.
- format = RemoteRepositoryFormat()
- format.rich_root_data = (response[1] == 'yes')
- format.supports_tree_reference = (response[2] == 'yes')
- format.supports_external_lookups = (response[3] == 'yes')
- format._network_name = response[4]
+ format = response_tuple_to_repo_format(response[1:])
# Used to support creating a real format instance when needed.
format._creating_bzrdir = a_bzrdir
remote_repo = RemoteRepository(a_bzrdir, format)
@@ -382,12 +389,19 @@
@property
def _serializer(self):
- # We should only be getting asked for the serializer for
- # RemoteRepositoryFormat objects when the RemoteRepositoryFormat object
- # is a concrete instance for a RemoteRepository. In this case we know
- # the creating_repo and can use it to supply the serializer.
- self._creating_repo._ensure_real()
- return self._creating_repo._real_repository._format._serializer
+ if self._custom_format is not None:
+ return self._custom_format._serializer
+ elif self._network_name is not None:
+ self._custom_format = repository.network_format_registry.get(
+ self._network_name)
+ return self._custom_format._serializer
+ else:
+ # We should only be getting asked for the serializer for
+ # RemoteRepositoryFormat objects when the RemoteRepositoryFormat object
+ # is a concrete instance for a RemoteRepository. In this case we know
+ # the creating_repo and can use it to supply the serializer.
+ self._creating_repo._ensure_real()
+ return self._creating_repo._real_repository._format._serializer
class RemoteRepository(_RpcHelper):
@@ -754,6 +768,8 @@
raise errors.UnexpectedSmartServerResponse(response)
def unlock(self):
+ if not self._lock_count:
+ raise errors.LockNotHeld(self)
self._lock_count -= 1
if self._lock_count > 0:
return
@@ -1456,6 +1472,7 @@
super(RemoteBranchFormat, self).__init__()
self._matchingbzrdir = RemoteBzrDirFormat()
self._matchingbzrdir.set_branch_format(self)
+ self._custom_format = None
def __eq__(self, other):
return (isinstance(other, RemoteBranchFormat) and
@@ -1464,25 +1481,69 @@
def get_format_description(self):
return 'Remote BZR Branch'
- def get_format_string(self):
- return 'Remote BZR Branch'
+ def network_name(self):
+ return self._network_name
def open(self, a_bzrdir):
return a_bzrdir.open_branch()
+ def _vfs_initialize(self, a_bzrdir):
+ # Initialisation when using a local bzrdir object, or a non-vfs init
+ # method is not available on the server.
+ # self._custom_format is always set - the start of initialize ensures
+ # that.
+ if isinstance(a_bzrdir, RemoteBzrDir):
+ a_bzrdir._ensure_real()
+ result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
+ else:
+ # We assume the bzrdir is parameterised; it may not be.
+ result = self._custom_format.initialize(a_bzrdir)
+ if (isinstance(a_bzrdir, RemoteBzrDir) and
+ not isinstance(result, RemoteBranch)):
+ result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
+ return result
+
def initialize(self, a_bzrdir):
- # Delegate to a _real object here - the RemoteBzrDir format now
- # supports delegating to parameterised branch formats and as such
- # this RemoteBranchFormat method is only called when no specific format
- # is selected.
+ # 1) get the network name to use.
+ if self._custom_format:
+ network_name = self._custom_format.network_name()
+ else:
+ # Select the current bzrlib default and ask for that.
+ reference_bzrdir_format = bzrdir.format_registry.get('default')()
+ reference_format = reference_bzrdir_format.get_branch_format()
+ self._custom_format = reference_format
+ network_name = reference_format.network_name()
+ # Being asked to create on a non RemoteBzrDir:
if not isinstance(a_bzrdir, RemoteBzrDir):
- result = a_bzrdir.create_branch()
+ return self._vfs_initialize(a_bzrdir)
+ medium = a_bzrdir._client._medium
+ if medium._is_remote_before((1, 13)):
+ return self._vfs_initialize(a_bzrdir)
+ # Creating on a remote bzr dir.
+ # 2) try direct creation via RPC
+ path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
+ verb = 'BzrDir.create_branch'
+ try:
+ response = a_bzrdir._call(verb, path, network_name)
+ except errors.UnknownSmartMethod:
+ # Fallback - use vfs methods
+ return self._vfs_initialize(a_bzrdir)
+ if response[0] != 'ok':
+ raise errors.UnexpectedSmartServerResponse(response)
+ # Turn the response into a RemoteRepository object.
+ format = RemoteBranchFormat()
+ format._network_name = response[1]
+ repo_format = response_tuple_to_repo_format(response[3:])
+ if response[2] == '':
+ repo_bzrdir = a_bzrdir
else:
- a_bzrdir._ensure_real()
- result = a_bzrdir._real_bzrdir.create_branch()
- if not isinstance(result, RemoteBranch):
- result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
- return result
+ repo_bzrdir = RemoteBzrDir(
+ a_bzrdir.root_transport.clone(response[2]), a_bzrdir._format,
+ a_bzrdir._client)
+ remote_repo = RemoteRepository(repo_bzrdir, repo_format)
+ remote_branch = RemoteBranch(a_bzrdir, remote_repo,
+ format=format, setup_stacking=False)
+ return remote_branch
def supports_tags(self):
# Remote branches might support tags, but we won't know until we
@@ -1497,12 +1558,18 @@
"""
def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
- _client=None):
+ _client=None, format=None, setup_stacking=True):
"""Create a RemoteBranch instance.
:param real_branch: An optional local implementation of the branch
format, usually accessing the data via the VFS.
:param _client: Private parameter for testing.
+ :param format: A RemoteBranchFormat object, None to create one
+ automatically. If supplied it should have a network_name already
+ supplied.
+ :param setup_stacking: If True make an RPC call to determine the
+ stacked (or not) status of the branch. If False assume the branch
+ is not stacked.
"""
# We intentionally don't call the parent class's __init__, because it
# will try to assign to self.tags, which is a property in this subclass.
@@ -1531,7 +1598,6 @@
else:
self._real_branch = None
# Fill out expected attributes of branch for bzrlib api users.
- self._format = RemoteBranchFormat()
self.base = self.bzrdir.root_transport.base
self._control_files = None
self._lock_mode = None
@@ -1539,11 +1605,27 @@
self._repo_lock_token = None
self._lock_count = 0
self._leave_lock = False
+ # Setup a format: note that we cannot call _ensure_real until all the
+ # attributes above are set: This code cannot be moved higher up in this
+ # function.
+ if format is None:
+ self._format = RemoteBranchFormat()
+ if real_branch is not None:
+ self._format._network_name = \
+ self._real_branch._format.network_name()
+ #else:
+ # # XXX: Need to get this from BzrDir.open_branch's return value.
+ # self._ensure_real()
+ # self._format._network_name = \
+ # self._real_branch._format.network_name()
+ else:
+ self._format = format
# The base class init is not called, so we duplicate this:
hooks = branch.Branch.hooks['open']
for hook in hooks:
hook(self)
- self._setup_stacking()
+ if setup_stacking:
+ self._setup_stacking()
def _setup_stacking(self):
# configure stacking into the remote repository, by reading it from
@@ -1889,25 +1971,6 @@
self._ensure_real()
return self._real_branch.set_stacked_on_url(stacked_location)
- def sprout(self, to_bzrdir, revision_id=None):
- branch_format = to_bzrdir._format._branch_format
- if (branch_format is None or
- isinstance(branch_format, RemoteBranchFormat)):
- # The to_bzrdir specifies RemoteBranchFormat (or no format, which
- # implies the same thing), but RemoteBranches can't be created at
- # arbitrary URLs. So create a branch in the same format as
- # _real_branch instead.
- # XXX: if to_bzrdir is a RemoteBzrDir, this should perhaps do
- # to_bzrdir.create_branch to create a RemoteBranch after all...
- self._ensure_real()
- result = self._real_branch._format.initialize(to_bzrdir)
- self.copy_content_into(result, revision_id=revision_id)
- result.set_parent(self.bzrdir.root_transport.base)
- else:
- result = branch.Branch.sprout(
- self, to_bzrdir, revision_id=revision_id)
- return result
-
@needs_write_lock
def pull(self, source, overwrite=False, stop_revision=None,
**kwargs):
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/repository.py 2009-02-24 08:09:17 +0000
@@ -47,10 +47,10 @@
from bzrlib.testament import Testament
""")
-from bzrlib import registry
from bzrlib.decorators import needs_read_lock, needs_write_lock
from bzrlib.inter import InterObject
from bzrlib.inventory import Inventory, InventoryDirectory, ROOT_ID
+from bzrlib import registry
from bzrlib.symbol_versioning import (
deprecated_method,
one_one,
@@ -2207,32 +2207,7 @@
control_files)
-class RepositoryFormatRegistry(registry.Registry):
- """Registry of RepositoryFormats."""
-
- def __init__(self, other_registry=None):
- registry.Registry.__init__(self)
- self._other_registry = other_registry
-
- def register_lazy(self, key, module_name, member_name,
- help=None, info=None,
- override_existing=False):
- # Overridden to allow capturing registrations to two seperate
- # registries in a single call.
- registry.Registry.register_lazy(self, key, module_name, member_name,
- help=help, info=info, override_existing=override_existing)
- if self._other_registry is not None:
- self._other_registry.register_lazy(key, module_name, member_name,
- help=help, info=info, override_existing=override_existing)
-
- def get(self, format_string):
- r = registry.Registry.get(self, format_string)
- if callable(r):
- r = r()
- return r
-
-
-network_format_registry = RepositoryFormatRegistry()
+network_format_registry = registry.FormatRegistry()
"""Registry of formats indexed by their network name.
The network name for a repository format is an identifier that can be used when
@@ -2241,7 +2216,7 @@
"""
-format_registry = RepositoryFormatRegistry(network_format_registry)
+format_registry = registry.FormatRegistry(network_format_registry)
"""Registry of formats, indexed by their BzrDirMetaFormat format string.
This can contain either format instances themselves, or classes/factories that
=== modified file 'bzrlib/smart/bzrdir.py'
--- a/bzrlib/smart/bzrdir.py 2009-02-23 15:42:47 +0000
+++ b/bzrlib/smart/bzrdir.py 2009-02-24 08:09:17 +0000
@@ -17,14 +17,13 @@
"""Server-side bzrdir related request implmentations."""
-from bzrlib import errors
+from bzrlib import branch, errors, repository
from bzrlib.bzrdir import BzrDir, BzrDirFormat
from bzrlib.smart.request import (
FailedSmartServerResponse,
SmartServerRequest,
SuccessfulSmartServerResponse,
)
-from bzrlib.repository import network_format_registry
class SmartServerRequestOpenBzrDir(SmartServerRequest):
@@ -68,6 +67,54 @@
repo_format.supports_external_lookups)
return rich_root, tree_ref, external_lookup
+ def _repo_relpath(self, current_transport, repository):
+ """Get the relative path for repository from current_transport."""
+ # the relpath of the bzrdir in the found repository gives us the
+ # path segments to pop-out.
+ relpath = repository.bzrdir.root_transport.relpath(
+ current_transport.base)
+ if len(relpath):
+ segments = ['..'] * len(relpath.split('/'))
+ else:
+ segments = []
+ return '/'.join(segments)
+
+
+class SmartServerRequestCreateBranch(SmartServerRequestBzrDir):
+
+ def do(self, path, network_name):
+ """Create a branch in the bzr dir at path.
+
+ This operates precisely like 'bzrdir.create_branch'.
+
+ If a bzrdir is not present, an exception is propogated
+ rather than 'no branch' because these are different conditions (and
+ this method should only be called after establishing that a bzr dir
+ exists anyway).
+
+ This is the initial version of this method introduced to the smart
+ server for 1.13.
+
+ :param path: The path to the bzrdir.
+ :param network_name: The network name of the branch type to create.
+ :return: (ok, network_name)
+ """
+ bzrdir = BzrDir.open_from_transport(
+ self.transport_from_client_path(path))
+ format = branch.network_format_registry.get(network_name)
+ bzrdir.branch_format = format
+ result = format.initialize(bzrdir)
+ rich_root, tree_ref, external_lookup = self._format_to_capabilities(
+ result.repository._format)
+ branch_format = result._format.network_name()
+ repo_format = result.repository._format.network_name()
+ repo_path = self._repo_relpath(bzrdir.root_transport,
+ result.repository)
+ # branch format, repo relpath, rich_root, tree_ref, external_lookup,
+ # repo_network_name
+ return SuccessfulSmartServerResponse(('ok', branch_format, repo_path,
+ rich_root, tree_ref, external_lookup, repo_format))
+
class SmartServerRequestCreateRepository(SmartServerRequestBzrDir):
@@ -93,7 +140,7 @@
bzrdir = BzrDir.open_from_transport(
self.transport_from_client_path(path))
shared = shared == 'True'
- format = network_format_registry.get(network_name)
+ format = repository.network_format_registry.get(network_name)
bzrdir.repository_format = format
result = format.initialize(bzrdir, shared=shared)
rich_root, tree_ref, external_lookup = self._format_to_capabilities(
@@ -118,17 +165,10 @@
bzrdir = BzrDir.open_from_transport(
self.transport_from_client_path(path))
repository = bzrdir.find_repository()
- # the relpath of the bzrdir in the found repository gives us the
- # path segments to pop-out.
- relpath = repository.bzrdir.root_transport.relpath(
- bzrdir.root_transport.base)
- if len(relpath):
- segments = ['..'] * len(relpath.split('/'))
- else:
- segments = []
+ path = self._repo_relpath(bzrdir.root_transport, repository)
rich_root, tree_ref, external_lookup = self._format_to_capabilities(
repository._format)
- return '/'.join(segments), rich_root, tree_ref, external_lookup
+ return path, rich_root, tree_ref, external_lookup
class SmartServerRequestFindRepositoryV1(SmartServerRequestFindRepository):
=== modified file 'bzrlib/smart/request.py'
--- a/bzrlib/smart/request.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/smart/request.py 2009-02-24 08:09:17 +0000
@@ -401,6 +401,8 @@
request_handlers.register_lazy(
'Branch.unlock', 'bzrlib.smart.branch', 'SmartServerBranchRequestUnlock')
request_handlers.register_lazy(
+ 'BzrDir.create_branch', 'bzrlib.smart.bzrdir', 'SmartServerRequestCreateBranch')
+request_handlers.register_lazy(
'BzrDir.create_repository', 'bzrlib.smart.bzrdir', 'SmartServerRequestCreateRepository')
request_handlers.register_lazy(
'BzrDir.find_repository', 'bzrlib.smart.bzrdir', 'SmartServerRequestFindRepositoryV1')
=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- a/bzrlib/tests/blackbox/test_push.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/tests/blackbox/test_push.py 2009-02-24 08:09:17 +0000
@@ -202,7 +202,7 @@
# being too low. If rpc_count increases, more network roundtrips have
# become necessary for this use case. Please do not adjust this number
# upwards without agreement from bzr's network support maintainers.
- self.assertEqual(60, rpc_count)
+ self.assertEqual(36, rpc_count)
def test_push_smart_stacked_streaming_acceptance(self):
self.setup_smart_server_with_call_log()
@@ -219,7 +219,7 @@
# being too low. If rpc_count increases, more network roundtrips have
# become necessary for this use case. Please do not adjust this number
# upwards without agreement from bzr's network support maintainers.
- self.assertEqual(85, rpc_count)
+ self.assertEqual(65, rpc_count)
remote = Branch.open('public')
self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
=== modified file 'bzrlib/tests/blackbox/test_upgrade.py'
--- a/bzrlib/tests/blackbox/test_upgrade.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/tests/blackbox/test_upgrade.py 2009-02-24 08:09:17 +0000
@@ -68,8 +68,8 @@
# when up to date we should get a message to that effect
(out, err) = self.run_bzr('upgrade current_format_branch', retcode=3)
self.assertEqual("", out)
- self.assertEqualDiff("bzr: ERROR: The branch format Bazaar-NG meta "
- "directory, format 1 is already at the most "
+ self.assertEqualDiff("bzr: ERROR: The branch format Meta "
+ "directory format 1 is already at the most "
"recent format.\n", err)
def test_upgrade_up_to_date_checkout_warns_branch_left_alone(self):
@@ -81,8 +81,8 @@
"upgraded separately.\n"
% get_transport(self.get_url('current_format_branch')).base,
out)
- self.assertEqualDiff("bzr: ERROR: The branch format Bazaar-NG meta "
- "directory, format 1 is already at the most "
+ self.assertEqualDiff("bzr: ERROR: The branch format Meta "
+ "directory format 1 is already at the most "
"recent format.\n", err)
def test_upgrade_checkout(self):
=== modified file 'bzrlib/tests/branch_implementations/test_branch.py'
--- a/bzrlib/tests/branch_implementations/test_branch.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/tests/branch_implementations/test_branch.py 2009-02-24 08:09:17 +0000
@@ -493,6 +493,28 @@
self.assertEquals(br.revision_history(), [])
+class TestBranchFormat(TestCaseWithBranch):
+
+ def test_branch_format_network_name(self):
+ br = self.make_branch('.')
+ format = br._format
+ network_name = format.network_name()
+ self.assertIsInstance(network_name, str)
+ # We want to test that the network_name matches the actual format on
+ # disk. For local branches that means that using network_name as a key
+ # in the registry gives back the same format. For remote branches we
+ # check that the network_name of the RemoteBranchFormat we have locally
+ # matches the actual format present on disk.
+ if isinstance(format, remote.RemoteBranchFormat):
+ br._ensure_real()
+ real_branch = br._real_branch
+ self.assertEqual(real_branch._format.network_name(), network_name)
+ else:
+ registry = branch.network_format_registry
+ looked_up_format = registry.get(network_name)
+ self.assertEqual(format.__class__, looked_up_format.__class__)
+
+
class ChrootedTests(TestCaseWithBranch):
"""A support class that provides readonly urls outside the local namespace.
=== modified file 'bzrlib/tests/branch_implementations/test_hooks.py'
--- a/bzrlib/tests/branch_implementations/test_hooks.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/tests/branch_implementations/test_hooks.py 2009-02-24 08:09:17 +0000
@@ -20,6 +20,7 @@
from bzrlib.errors import HookFailed, TipChangeRejected
from bzrlib.remote import RemoteBranch
from bzrlib.revision import NULL_REVISION
+from bzrlib.smart import server
from bzrlib.tests import TestCaseWithMemoryTransport
@@ -147,12 +148,17 @@
b = self.make_branch('.')
if isinstance(b, RemoteBranch):
# RemoteBranch creation:
- # - creates the branch via the VFS
+ # - creates the branch via the VFS (for older servers)
# - does a branch open (by creating a RemoteBranch object)
- # - this has the same behaviour as simple branch opening, with an
- # additional VFS open at the front.
- self.assertEqual(b._real_branch, self.hook_calls[0])
- self.assertOpenedRemoteBranch(self.hook_calls[1:], b)
+ # - this has the nearly the same behaviour as simple branch opening
+ if (self.transport_readonly_server ==
+ server.ReadonlySmartTCPServer_for_testing_v2_only):
+ # Older servers:
+ self.assertEqual(b._real_branch, self.hook_calls[0])
+ self.assertOpenedRemoteBranch(self.hook_calls[1:], b)
+ else:
+ self.assertOpenedRemoteBranch(self.hook_calls, b,
+ remote_first=True)
else:
self.assertEqual([b], self.hook_calls)
@@ -165,17 +171,31 @@
else:
self.assertEqual([b], self.hook_calls)
- def assertOpenedRemoteBranch(self, hook_calls, b):
- """Assert that the expected calls were recorded for opening 'b'."""
+ def assertOpenedRemoteBranch(self, hook_calls, b, remote_first=False):
+ """Assert that the expected calls were recorded for opening 'b'.
+
+ :param remote_first: If True expect the server side operation to open
+ the branch object first.
+ """
# RemoteBranch open always opens the backing branch to get stacking
# details. As that is done remotely we can't see the branch object
# nor even compare base url's etc. So we just assert that the first
# branch returned is the RemoteBranch, and that the second is a
# Branch but not a RemoteBranch.
+ #
+ # RemoteBranch *creation* on the other hand creates the branch object
+ # on the server, and then creates the local proxy object in the client,
+ # so it sees the reverse order.
self.assertEqual(2, len(hook_calls))
- self.assertEqual(b, hook_calls[0])
- self.assertIsInstance(hook_calls[1], Branch)
- self.assertFalse(isinstance(hook_calls[1], RemoteBranch))
+ if remote_first:
+ real_index = 0
+ remote_index = 1
+ else:
+ real_index = 1
+ remote_index = 0
+ self.assertEqual(b, hook_calls[remote_index])
+ self.assertIsInstance(hook_calls[real_index], Branch)
+ self.assertFalse(isinstance(hook_calls[real_index], RemoteBranch))
class TestPreChangeBranchTip(ChangeBranchTipTestCase):
=== modified file 'bzrlib/tests/branch_implementations/test_sprout.py'
--- a/bzrlib/tests/branch_implementations/test_sprout.py 2009-02-13 00:52:18 +0000
+++ b/bzrlib/tests/branch_implementations/test_sprout.py 2009-02-24 05:37:17 +0000
@@ -70,6 +70,9 @@
# did the right thing.
target._ensure_real()
target = target._real_branch
+ if isinstance(result_format, remote.RemoteBranchFormat):
+ # Unwrap a parameterised RemoteBranchFormat for comparison.
+ result_format = result_format._custom_format
self.assertIs(result_format.__class__, target._format.__class__)
def test_sprout_partial(self):
=== modified file 'bzrlib/tests/test_errors.py'
--- a/bzrlib/tests/test_errors.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/tests/test_errors.py 2009-02-24 08:09:17 +0000
@@ -256,8 +256,8 @@
def test_up_to_date(self):
error = errors.UpToDateFormat(bzrdir.BzrDirFormat4())
- self.assertEqualDiff("The branch format Bazaar-NG branch, "
- "format 0.0.4 is already at the most "
+ self.assertEqualDiff("The branch format All-in-one "
+ "format 4 is already at the most "
"recent format.",
str(error))
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2009-02-23 15:42:47 +0000
+++ b/bzrlib/tests/test_remote.py 2009-02-24 08:09:17 +0000
@@ -459,6 +459,42 @@
RemoteBzrDirFormat.probe_transport, OldServerTransport())
+class TestBzrDirCreateBranch(TestRemote):
+
+ def test_backwards_compat(self):
+ self.setup_smart_server_with_call_log()
+ repo = self.make_repository('.')
+ self.reset_smart_call_log()
+ self.disable_verb('BzrDir.create_branch')
+ branch = repo.bzrdir.create_branch()
+ create_branch_call_count = len([call for call in self.hpss_calls if
+ call[0].method == 'BzrDir.create_branch'])
+ self.assertEqual(1, create_branch_call_count)
+
+ def test_current_server(self):
+ transport = self.get_transport('.')
+ transport = transport.clone('quack')
+ self.make_repository('quack')
+ client = FakeClient(transport.base)
+ reference_bzrdir_format = bzrdir.format_registry.get('default')()
+ reference_format = reference_bzrdir_format.get_branch_format()
+ network_name = reference_format.network_name()
+ reference_repo_fmt = reference_bzrdir_format.repository_format
+ reference_repo_name = reference_repo_fmt.network_name()
+ client.add_expected_call(
+ 'BzrDir.create_branch', ('quack/', network_name),
+ 'success', ('ok', network_name, '', 'no', 'no', 'yes',
+ reference_repo_name))
+ a_bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
+ _client=client)
+ branch = a_bzrdir.create_branch()
+ # We should have got a remote branch
+ self.assertIsInstance(branch, remote.RemoteBranch)
+ # its format should have the settings from the response
+ format = branch._format
+ self.assertEqual(network_name, format.network_name())
+
+
class TestBzrDirCreateRepository(TestRemote):
def test_backwards_compat(self):
@@ -831,7 +867,6 @@
branch = self.make_remote_branch(transport, client)
branch._ensure_real = lambda: None
branch.lock_write()
- self.addCleanup(branch.unlock)
# The 'TipChangeRejected' error response triggered by calling
# set_revision_history causes a TipChangeRejected exception.
err = self.assertRaises(
More information about the bazaar-commits
mailing list