Rev 4108: Cherrypick bugfixes from bzr.dev for 1.13: in http://people.ubuntu.com/~robertc/baz2.0/pending/1.13-cherrypicks
Robert Collins
robertc at robertcollins.net
Fri Mar 13 04:36:36 GMT 2009
At http://people.ubuntu.com/~robertc/baz2.0/pending/1.13-cherrypicks
------------------------------------------------------------
revno: 4108
revision-id: robertc at robertcollins.net-20090313043606-7ibht1zuuhww2sn2
parent: pqm at pqm.ubuntu.com-20090311094306-qdrxqed2k7sgxf7z
parent: pqm at pqm.ubuntu.com-20090310064619-eq2pa07gvakf6zsk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 1.13-cherrypicks
timestamp: Fri 2009-03-13 15:36:06 +1100
message:
Cherrypick bugfixes from bzr.dev for 1.13:
4142: Fix performance regression (many small round-trips) when pushing to
a remote pack, and improve some tests.
4129: Fix bug when pushing stackable branch in unstackable repo to
default-stacking target.
4121: Remove __del__ from LockableFiles.
4117: Handle inconsistent inventories in fetch more robustly.
4105: Report network activity for bzr+ssh:// and bzr:// connections.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 4104.1.1
revision-id: pqm at pqm.ubuntu.com-20090310064619-eq2pa07gvakf6zsk
parent: pqm at pqm.ubuntu.com-20090310060738-6js2ofvx7q1gfg63
parent: andrew.bennetts at canonical.com-20090310051957-zujoj77915oqz621
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-03-10 06:46:19 +0000
message:
(andrew) Report network activity for bzr+ssh:// and bzr://
connections.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 3958.1.7
revision-id: andrew.bennetts at canonical.com-20090310051957-zujoj77915oqz621
parent: andrew.bennetts at canonical.com-20090310051449-x10ya52jljmo5dip
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: traffic-smart
timestamp: Tue 2009-03-10 15:19:57 +1000
message:
Correct NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3958.1.6
revision-id: andrew.bennetts at canonical.com-20090310051449-x10ya52jljmo5dip
parent: andrew.bennetts at canonical.com-20090310051147-at40wr27kklptx63
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: traffic-smart
timestamp: Tue 2009-03-10 15:14:49 +1000
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3958.1.5
revision-id: andrew.bennetts at canonical.com-20090310051147-at40wr27kklptx63
parent: andrew.bennetts at canonical.com-20090310045728-ty6iymi18247i2pl
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: traffic-smart
timestamp: Tue 2009-03-10 15:11:47 +1000
message:
Remove unnecessary 'direction' argument to osutils.send_all.
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
------------------------------------------------------------
revno: 3958.1.4
revision-id: andrew.bennetts at canonical.com-20090310045728-ty6iymi18247i2pl
parent: andrew.bennetts at canonical.com-20090204120747-nhgz4hxfy3gjwhmw
parent: pqm at pqm.ubuntu.com-20090310033520-f2ynw0fprjw433m2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: traffic-smart
timestamp: Tue 2009-03-10 14:57:28 +1000
message:
Merge bzr.dev
added:
bzrlib/clean_tree.py clean_tree.py-20050827022328-5ba46e22d074695c
bzrlib/help_topics/en/log-formats.txt logformats.txt-20090209081655-5wpbws2oqz8k5oq7-1
bzrlib/plugins/launchpad/test_lp_open.py test_lp_open.py-20090125174355-hxrsxh3sj84225qu-1
bzrlib/tests/blackbox/test_clean_tree.py test_clean_tree.py-20090219235516-em1ybc01twsqacx9-1
bzrlib/tests/blackbox/test_filtered_view_ops.py test_filtered_view_o-20081110012645-5t7ogtola0l33lkg-1
bzrlib/tests/blackbox/test_view.py test_view.py-20080731135100-66o8o32heop7augi-1
bzrlib/tests/branch_implementations/test_create_clone.py test_create_clone.py-20090225031440-8ybpkzojo7cvourv-1
bzrlib/tests/per_interbranch/ per_interbranch-20090224001510-b1eq9kzmh3psmh6x-1
bzrlib/tests/per_interbranch/__init__.py __init__.py-20090225010018-l7w4uvvt73ea2vj9-1
bzrlib/tests/per_interbranch/test_update_revisions.py test_update_revision-20090225011043-7u1jnapdeuj07rre-1
bzrlib/tests/test_clean_tree.py test_clean_tree.py-20060603174249-ozlk5sl2166opxbk-1
bzrlib/tests/test_debug.py test_debug.py-20090303053802-01e8mlv24odmpgix-1
bzrlib/tests/test_export.py test_export.py-20090220201010-tpbxssdnezsvu9pk-1
bzrlib/tests/test_patches_data/diff-7 diff7-20081201221107-q9f611rir3xx1hdp-1
bzrlib/tests/test_patches_data/mod-7 mod7-20081201221107-q9f611rir3xx1hdp-2
bzrlib/tests/test_patches_data/orig-7 orig7-20081201221107-q9f611rir3xx1hdp-3
bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
bzrlib/tests/workingtree_implementations/test_views.py test_views.py-20080729134135-v4zjnb85eu9srl80-1
bzrlib/views.py views.py-20080729082027-1ouh6t9cdobc0eea-1
doc/developers/colocated-branches.txt colocatedbranches.tx-20090209183539-wv9upczfd8ryyfn1-1
doc/developers/ec2-windows.txt ec2windows.txt-20090219062112-2ga0nqpcm7n02njf-1
doc/en/user-guide/filtered_views.txt filtered_views.txt-20090226100856-a16ba1v97v91ru58-1
doc/en/user-guide/organizing_your_workspace.txt organizing_your_work-20090226112520-bc2njq3kwvpeo814-1
tools/prepare_for_latex.py prepare_for_latex.py-20090212165735-79tn1t4dhnxyz7m9-1
tools/rst2pdf.py rst2pdf.py-20090212165735-79tn1t4dhnxyz7m9-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_patiencediff_py.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
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/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
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/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
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/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-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/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
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/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/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/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-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/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
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/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
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_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
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_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
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_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-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/https_server.py https_server.py-20071121173708-aj8zczi0ziwbwz21-1
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_lock/__init__.py __init__.py-20070314201444-u92yjsqrkh2m3qcb-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_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
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__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
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_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
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_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
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_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
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_options.py testoptions.py-20051014093702-96457cfc86319a8f
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_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
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_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
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_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/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/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/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/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/developers/revision-properties.txt revisionproperties.t-20070807133526-w57m8zv5o7t5kugm-1
doc/developers/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
doc/en/user-guide/recording_changes.txt recording_changes.tx-20071121073725-0corxykv5irjal00-4
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
doc/en/user-guide/solo_intro.txt solo_workflow.txt-20071121073725-0corxykv5irjal00-7
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
doc/en/user-guide/using_gatekeepers.txt using_gatekeepers.tx-20071123154453-dk2mjhrg1vpjm5w2-5
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3958.1.3
revision-id: andrew.bennetts at canonical.com-20090204120747-nhgz4hxfy3gjwhmw
parent: andrew.bennetts at canonical.com-20090126071908-3bm16phl14azc4jj
parent: pqm at pqm.ubuntu.com-20090204045809-piqek6zlyl0x5ncw
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: traffic-smart
timestamp: Wed 2009-02-04 23:07:47 +1100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/foreign.py foreign.py-20081112170002-olsxmandkk8qyfuq-1
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/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
bzrlib/tests/test_foreign.py test_foreign.py-20081125004048-ywb901edgp9lluxo-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
doc/developers/plugin-api.txt pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
------------------------------------------------------------
revno: 3958.1.2
revision-id: andrew.bennetts at canonical.com-20090126071908-3bm16phl14azc4jj
parent: andrew.bennetts at canonical.com-20090126065918-mi70n64jrapnchu5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: traffic-smart
timestamp: Mon 2009-01-26 18:19:08 +1100
message:
Report network activity from more client medium implementations.
modified:
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
------------------------------------------------------------
revno: 3958.1.1
revision-id: andrew.bennetts at canonical.com-20090126065918-mi70n64jrapnchu5
parent: pqm at pqm.ubuntu.com-20090124185051-8oryvqq68n6repso
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: traffic-smart
timestamp: Mon 2009-01-26 17:59:18 +1100
message:
Report traffic on smart media as transport activity.
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
=== modified file 'NEWS'
--- a/NEWS 2009-03-11 00:46:56 +0000
+++ b/NEWS 2009-03-13 04:36:06 +0000
@@ -5,8 +5,18 @@
.. contents::
-IN DEVELOPMENT
---------------
+bzr 1.13
+--------
+
+ BUG FIXES:
+
+ * Fix "is not a stackable format" error when pushing a
+ stackable-format branch with an unstackable-format repository to a
+ destination with a default stacking policy. (Andrew Bennetts)
+
+ * Progress bars now show the rate of network activity for
+ ``bzr+ssh://`` and ``bzr://`` connections. (Andrew Bennetts)
+
bzr 1.13rc1 "paraskavedekatriaphobia" 2009-03-10
------------------------------------------------
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2009-03-06 12:00:07 +0000
+++ b/bzrlib/bzrdir.py 2009-03-13 04:36:06 +0000
@@ -2823,7 +2823,6 @@
result._custom_format = custom_format._custom_format
else:
result._custom_format = custom_format
- result.rich_root_data = custom_format.rich_root_data
return result
def get_branch_format(self):
@@ -3062,7 +3061,8 @@
stack_on = self._get_full_stack_on()
try:
branch.set_stacked_on_url(stack_on)
- except errors.UnstackableBranchFormat:
+ except (errors.UnstackableBranchFormat,
+ errors.UnstackableRepositoryFormat):
if self._require_stacking:
raise
=== modified file 'bzrlib/lockable_files.py'
--- a/bzrlib/lockable_files.py 2009-01-17 01:30:58 +0000
+++ b/bzrlib/lockable_files.py 2009-03-13 04:36:06 +0000
@@ -43,6 +43,23 @@
# somewhat redundant with what's done in LockDir; the main difference is that
# LockableFiles permits reentrancy.
+class _LockWarner(object):
+ """Hold a counter for a lock and warn if GCed while the count is >= 1.
+
+ This is separate from LockableFiles because putting a __del__ on
+ LockableFiles can result in uncollectable cycles.
+ """
+
+ def __init__(self, repr):
+ self.lock_count = 0
+ self.repr = repr
+
+ def __del__(self):
+ if self.lock_count >= 1:
+ # There should have been a try/finally to unlock this.
+ warnings.warn("%r was gc'd while locked" % self.repr)
+
+
class LockableFiles(object):
"""Object representing a set of related files locked within the same scope.
@@ -88,7 +105,7 @@
self.lock_name = lock_name
self._transaction = None
self._lock_mode = None
- self._lock_count = 0
+ self._lock_warner = _LockWarner(repr(self))
self._find_modes()
esc_name = self._escape(lock_name)
self._lock = lock_class(transport, esc_name,
@@ -109,12 +126,6 @@
def __str__(self):
return 'LockableFiles(%s, %s)' % (self.lock_name, self._transport.base)
- def __del__(self):
- if self.is_locked():
- # do not automatically unlock; there should have been a
- # try/finally to unlock this.
- warnings.warn("%r was gc'd while locked" % self)
-
def break_lock(self):
"""Break the lock of this lockable files group if it is held.
@@ -253,13 +264,13 @@
if self._lock_mode != 'w' or not self.get_transaction().writeable():
raise errors.ReadOnlyError(self)
self._lock.validate_token(token)
- self._lock_count += 1
+ self._lock_warner.lock_count += 1
return self._token_from_lock
else:
token_from_lock = self._lock.lock_write(token=token)
#traceback.print_stack()
self._lock_mode = 'w'
- self._lock_count = 1
+ self._lock_warner.lock_count = 1
self._set_transaction(transactions.WriteTransaction())
self._token_from_lock = token_from_lock
return token_from_lock
@@ -268,12 +279,12 @@
if self._lock_mode:
if self._lock_mode not in ('r', 'w'):
raise ValueError("invalid lock mode %r" % (self._lock_mode,))
- self._lock_count += 1
+ self._lock_warner.lock_count += 1
else:
self._lock.lock_read()
#traceback.print_stack()
self._lock_mode = 'r'
- self._lock_count = 1
+ self._lock_warner.lock_count = 1
self._set_transaction(transactions.ReadOnlyTransaction())
# 5K may be excessive, but hey, its a knob.
self.get_transaction().set_cache_size(5000)
@@ -281,19 +292,23 @@
def unlock(self):
if not self._lock_mode:
raise errors.LockNotHeld(self)
- if self._lock_count > 1:
- self._lock_count -= 1
+ if self._lock_warner.lock_count > 1:
+ self._lock_warner.lock_count -= 1
else:
#traceback.print_stack()
self._finish_transaction()
try:
self._lock.unlock()
finally:
- self._lock_mode = self._lock_count = None
+ self._lock_mode = self._lock_warner.lock_count = None
+
+ @property
+ def _lock_count(self):
+ return self._lock_warner.lock_count
def is_locked(self):
"""Return true if this LockableFiles group is locked"""
- return self._lock_count >= 1
+ return self._lock_warner.lock_count >= 1
def get_physical_lock_status(self):
"""Return physical lock status.
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/osutils.py 2009-03-10 05:11:47 +0000
@@ -1623,15 +1623,21 @@
return b
-def send_all(socket, bytes):
+def send_all(socket, bytes, report_activity=None):
"""Send all bytes on a socket.
Regular socket.sendall() can give socket error 10053 on Windows. This
implementation sends no more than 64k at a time, which avoids this problem.
+
+ :param report_activity: Call this as bytes are read, see
+ Transport._report_activity
"""
chunk_size = 2**16
for pos in xrange(0, len(bytes), chunk_size):
- until_no_eintr(socket.sendall, bytes[pos:pos+chunk_size])
+ block = bytes[pos:pos+chunk_size]
+ if report_activity is not None:
+ report_activity(len(block), 'write')
+ until_no_eintr(socket.sendall, block)
def dereference_path(path):
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2009-03-11 06:50:04 +0000
+++ b/bzrlib/remote.py 2009-03-13 04:36:06 +0000
@@ -73,9 +73,9 @@
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._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
@@ -412,6 +412,32 @@
self._custom_format = None
self._network_name = None
self._creating_bzrdir = None
+ self._supports_external_lookups = None
+ self._supports_tree_reference = None
+ self._rich_root_data = None
+
+ @property
+ def rich_root_data(self):
+ if self._rich_root_data is None:
+ self._ensure_real()
+ self._rich_root_data = self._custom_format.rich_root_data
+ return self._rich_root_data
+
+ @property
+ def supports_external_lookups(self):
+ if self._supports_external_lookups is None:
+ self._ensure_real()
+ self._supports_external_lookups = \
+ self._custom_format.supports_external_lookups
+ return self._supports_external_lookups
+
+ @property
+ def supports_tree_reference(self):
+ if self._supports_tree_reference is None:
+ self._ensure_real()
+ self._supports_tree_reference = \
+ self._custom_format.supports_tree_reference
+ return self._supports_tree_reference
def _vfs_initialize(self, a_bzrdir, shared):
"""Helper for common code in initialize."""
@@ -995,12 +1021,9 @@
:param repository: A repository.
"""
- # XXX: At the moment the RemoteRepository will allow fallbacks
- # unconditionally - however, a _real_repository will usually exist,
- # and may raise an error if it's not accommodated by the underlying
- # format. Eventually we should check when opening the repository
- # whether it's willing to allow them or not.
- #
+ if not self._format.supports_external_lookups:
+ raise errors.UnstackableRepositoryFormat(
+ self._format.network_name(), self.base)
# We need to accumulate additional repositories here, to pass them in
# on various RPC's.
#
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2009-03-06 10:01:37 +0000
+++ b/bzrlib/repository.py 2009-03-13 04:36:06 +0000
@@ -1453,6 +1453,26 @@
result[key] = True
return result
+ def _inventory_xml_lines_for_keys(self, keys):
+ """Get a line iterator of the sort needed for findind references.
+
+ Not relevant for non-xml inventory repositories.
+
+ Ghosts in revision_keys are ignored.
+
+ :param revision_keys: The revision keys for the inventories to inspect.
+ :return: An iterator over (inventory line, revid) for the fulltexts of
+ all of the xml inventories specified by revision_keys.
+ """
+ stream = self.inventories.get_record_stream(keys, 'unordered', True)
+ for record in stream:
+ if record.storage_kind != 'absent':
+ chunks = record.get_bytes_as('chunked')
+ revid = record.key[-1]
+ lines = osutils.chunks_to_lines(chunks)
+ for line in lines:
+ yield line, revid
+
def _find_file_ids_from_xml_inventory_lines(self, line_iterator,
revision_ids):
"""Helper routine for fileids_altered_by_revision_ids.
@@ -1468,15 +1488,20 @@
revision_ids. Each altered file-ids has the exact revision_ids that
altered it listed explicitly.
"""
+ seen = set(self._find_text_key_references_from_xml_inventory_lines(
+ line_iterator).iterkeys())
+ # Note that revision_ids are revision keys.
+ parent_maps = self.revisions.get_parent_map(revision_ids)
+ parents = set()
+ map(parents.update, parent_maps.itervalues())
+ parents.difference_update(revision_ids)
+ parent_seen = set(self._find_text_key_references_from_xml_inventory_lines(
+ self._inventory_xml_lines_for_keys(parents)))
+ new_keys = seen - parent_seen
result = {}
setdefault = result.setdefault
- for key in \
- self._find_text_key_references_from_xml_inventory_lines(
- line_iterator).iterkeys():
- # once data is all ensured-consistent; then this is
- # if revision_id == version_id
- if key[-1:] in revision_ids:
- setdefault(key[0], set()).add(key[-1])
+ for key in new_keys:
+ setdefault(key[0], set()).add(key[-1])
return result
def fileids_altered_by_revision_ids(self, revision_ids, _inv_weave=None):
@@ -3165,10 +3190,7 @@
# We don't copy the text for the root node unless the
# target supports_rich_root.
continue
- # TODO: Do we need:
- # "if entry.revision == current_revision_id" ?
- if entry.revision == current_revision_id:
- text_keys.add((file_id, entry.revision))
+ text_keys.add((file_id, entry.revision))
revision = self.source.get_revision(current_revision_id)
pending_deltas.append((basis_id, delta,
current_revision_id, revision.parent_ids))
@@ -3379,6 +3401,12 @@
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
fetch_spec=None):
"""See InterRepository.fetch()."""
+ if self.target._client._medium._is_remote_before((1, 13)):
+ # The server won't support the insert_stream RPC, so just use
+ # regular InterPackRepo logic. This avoids a bug that causes many
+ # round-trips for small append calls.
+ return InterPackRepo.fetch(self, revision_id=revision_id, pb=pb,
+ find_ghosts=find_ghosts, fetch_spec=fetch_spec)
# Always fetch using the generic streaming fetch code, to allow
# streaming fetching into remote servers.
from bzrlib.fetch import RepoFetcher
=== modified file 'bzrlib/smart/medium.py'
--- a/bzrlib/smart/medium.py 2009-03-06 08:17:36 +0000
+++ b/bzrlib/smart/medium.py 2009-03-10 04:57:28 +0000
@@ -40,6 +40,7 @@
osutils,
symbol_versioning,
trace,
+ ui,
urlutils,
)
from bzrlib.smart import client, protocol
@@ -162,6 +163,18 @@
self._push_back(excess)
return line
+ def _report_activity(self, bytes, direction):
+ """Notify that this medium has activity.
+
+ Implementations should call this from all methods that actually do IO.
+ Be careful that it's not called twice, if one method is implemented on
+ top of another.
+
+ :param bytes: Number of bytes read or written.
+ :param direction: 'read' or 'write' or None.
+ """
+ ui.ui_factory.report_transport_activity(self, bytes, direction)
+
class SmartServerStreamMedium(SmartMedium):
"""Handles smart commands coming over a stream.
@@ -274,7 +287,9 @@
def _read_bytes(self, desired_count):
# We ignore the desired_count because on sockets it's more efficient to
# read large chunks (of _MAX_READ_SIZE bytes) at a time.
- return osutils.until_no_eintr(self.socket.recv, _MAX_READ_SIZE)
+ bytes = osutils.until_no_eintr(self.socket.recv, _MAX_READ_SIZE)
+ self._report_activity(len(bytes), 'read')
+ return bytes
def terminate_due_to_error(self):
# TODO: This should log to a server log file, but no such thing
@@ -283,7 +298,7 @@
self.finished = True
def _write_out(self, bytes):
- osutils.send_all(self.socket, bytes)
+ osutils.send_all(self.socket, bytes, self._report_activity)
class SmartServerPipeStreamMedium(SmartServerStreamMedium):
@@ -689,6 +704,7 @@
def _accept_bytes(self, bytes):
"""See SmartClientStreamMedium.accept_bytes."""
self._writeable_pipe.write(bytes)
+ self._report_activity(len(bytes), 'write')
def _flush(self):
"""See SmartClientStreamMedium._flush()."""
@@ -696,7 +712,9 @@
def _read_bytes(self, count):
"""See SmartClientStreamMedium._read_bytes."""
- return self._readable_pipe.read(count)
+ bytes = self._readable_pipe.read(count)
+ self._report_activity(len(bytes), 'read')
+ return bytes
class SmartSSHClientMedium(SmartClientStreamMedium):
@@ -730,6 +748,7 @@
"""See SmartClientStreamMedium.accept_bytes."""
self._ensure_connection()
self._write_to.write(bytes)
+ self._report_activity(len(bytes), 'write')
def disconnect(self):
"""See SmartClientMedium.disconnect()."""
@@ -765,7 +784,9 @@
if not self._connected:
raise errors.MediumNotConnected(self)
bytes_to_read = min(count, _MAX_READ_SIZE)
- return self._read_from.read(bytes_to_read)
+ bytes = self._read_from.read(bytes_to_read)
+ self._report_activity(len(bytes), 'read')
+ return bytes
# Port 4155 is the default port for bzr://, registered with IANA.
@@ -787,7 +808,7 @@
def _accept_bytes(self, bytes):
"""See SmartClientMedium.accept_bytes."""
self._ensure_connection()
- osutils.send_all(self._socket, bytes)
+ osutils.send_all(self._socket, bytes, self._report_activity)
def disconnect(self):
"""See SmartClientMedium.disconnect()."""
@@ -850,13 +871,16 @@
# We ignore the desired_count because on sockets it's more efficient to
# read large chunks (of _MAX_READ_SIZE bytes) at a time.
try:
- return self._socket.recv(_MAX_READ_SIZE)
+ bytes = osutils.until_no_eintr(self._socket.recv, _MAX_READ_SIZE)
except socket.error, e:
if len(e.args) and e.args[0] == errno.ECONNRESET:
# Callers expect an empty string in that case
return ''
else:
raise
+ else:
+ self._report_activity(len(bytes), 'read')
+ return bytes
class SmartClientStreamMediumRequest(SmartClientMediumRequest):
=== modified file 'bzrlib/tests/bzrdir_implementations/test_bzrdir.py'
--- a/bzrlib/tests/bzrdir_implementations/test_bzrdir.py 2009-03-05 12:49:55 +0000
+++ b/bzrlib/tests/bzrdir_implementations/test_bzrdir.py 2009-03-13 04:36:06 +0000
@@ -126,21 +126,14 @@
for rev_id in left_repo.all_revision_ids():
self.assertEqual(left_repo.get_revision(rev_id),
right_repo.get_revision(rev_id))
- # inventories
- left_inv_weave = left_repo.inventories
- right_inv_weave = right_repo.inventories
- self.assertEqual(set(left_inv_weave.keys()),
- set(right_inv_weave.keys()))
- # XXX: currently this does not handle indirectly referenced
- # inventories (e.g. where the inventory is a delta basis for
- # one that is fully present but that the revid for that
- # inventory is not yet present.)
- self.assertEqual(set(left_inv_weave.keys()),
- set(left_repo.revisions.keys()))
- left_trees = left_repo.revision_trees(all_revs)
- right_trees = right_repo.revision_trees(all_revs)
- for left_tree, right_tree in izip(left_trees, right_trees):
- self.assertEqual(left_tree.inventory, right_tree.inventory)
+ # Assert the revision trees (and thus the inventories) are equal
+ sort_key = lambda rev_tree: rev_tree.get_revision_id()
+ rev_trees_a = sorted(
+ left_repo.revision_trees(all_revs), key=sort_key)
+ rev_trees_b = sorted(
+ right_repo.revision_trees(all_revs), key=sort_key)
+ for tree_a, tree_b in zip(rev_trees_a, rev_trees_b):
+ self.assertEqual([], list(tree_a.iter_changes(tree_b)))
# texts
text_index = left_repo._generate_text_key_index()
self.assertEqual(text_index,
@@ -886,6 +879,8 @@
dir = source.bzrdir
target = dir.sprout(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
+ target_repo = target.open_repository()
+ self.assertRepositoryHasSameItems(source.repository, target_repo)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
[
'./.bzr/basis-inventory-cache',
@@ -896,7 +891,7 @@
'./.bzr/checkout/stat-cache',
'./.bzr/inventory',
'./.bzr/parent',
- './.bzr/repository/inventory.knit',
+ './.bzr/repository',
'./.bzr/stat-cache',
'./foo',
])
=== modified file 'bzrlib/tests/interrepository_implementations/test_fetch.py'
--- a/bzrlib/tests/interrepository_implementations/test_fetch.py 2009-01-17 01:30:58 +0000
+++ b/bzrlib/tests/interrepository_implementations/test_fetch.py 2009-03-13 04:36:06 +0000
@@ -20,8 +20,10 @@
import bzrlib
from bzrlib import (
errors,
+ inventory,
+ osutils,
repository,
- osutils,
+ versionedfile,
)
from bzrlib.errors import (
NoSuchRevision,
@@ -73,6 +75,56 @@
repo_b = self.make_to_repository('b')
check_push_rev1(repo_b)
+ def test_fetch_inconsistent_last_changed_entries(self):
+ """If an inventory has odd data we should still get what it references.
+
+ This test tests that we do fetch a file text created in a revision not
+ being fetched, but referenced from the revision we are fetching when the
+ adjacent revisions to the one being fetched do not reference that text.
+ """
+ tree = self.make_branch_and_tree('source')
+ revid = tree.commit('old')
+ to_repo = self.make_to_repository('to_repo')
+ to_repo.fetch(tree.branch.repository, revid)
+ # Make a broken revision and fetch it.
+ source = tree.branch.repository
+ source.lock_write()
+ self.addCleanup(source.unlock)
+ source.start_write_group()
+ try:
+ # We need two revisions: OLD and NEW. NEW will claim to need a file
+ # 'FOO' changed in 'OLD'. OLD will not have that file at all.
+ source.texts.insert_record_stream([
+ versionedfile.FulltextContentFactory(('foo', revid), (), None,
+ 'contents')])
+ basis = source.revision_tree(revid)
+ parent_id = basis.path2id('')
+ entry = inventory.make_entry('file', 'foo-path', parent_id, 'foo')
+ entry.revision = revid
+ entry.text_size = len('contents')
+ entry.text_sha1 = osutils.sha_string('contents')
+ inv_sha1, _ = source.add_inventory_by_delta(revid, [
+ (None, 'foo-path', 'foo', entry)], 'new', [revid])
+ rev = Revision(timestamp=0,
+ timezone=None,
+ committer="Foo Bar <foo at example.com>",
+ message="Message",
+ inventory_sha1=inv_sha1,
+ revision_id='new',
+ parent_ids=[revid])
+ source.add_revision(rev.revision_id, rev)
+ except:
+ source.abort_write_group()
+ raise
+ else:
+ source.commit_write_group()
+ to_repo.fetch(source, 'new')
+ to_repo.lock_read()
+ self.addCleanup(to_repo.unlock)
+ self.assertEqual('contents',
+ to_repo.texts.get_record_stream([('foo', revid)],
+ 'unordered', True).next().get_bytes_as('fulltext'))
+
def test_fetch_missing_basis_text(self):
"""If fetching a delta, we should die if a basis is not present."""
tree = self.make_branch_and_tree('tree')
=== modified file 'bzrlib/tests/per_repository/test_fileid_involved.py'
--- a/bzrlib/tests/per_repository/test_fileid_involved.py 2009-01-17 01:30:58 +0000
+++ b/bzrlib/tests/per_repository/test_fileid_involved.py 2009-03-13 04:36:06 +0000
@@ -141,6 +141,7 @@
print set(self.branch.repository.get_ancestry(new)).difference(set(self.branch.repository.get_ancestry(old)))
self.branch.lock_read()
self.addCleanup(self.branch.unlock)
+ self.branch.repository.fileids_altered_by_revision_ids(["rev-J","rev-K"])
self.assertEqual(
{'b-file-id-2006-01-01-defg':set(['rev-J']),
'c-funky<file-id>quiji%bo':set(['rev-K'])
=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py 2009-02-27 01:02:40 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py 2009-03-13 04:36:06 +0000
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-"""Tests for bzrdir implementations - tests a bzrdir format."""
+"""Tests for repository implementations - tests a repository format."""
from cStringIO import StringIO
import re
@@ -808,6 +808,26 @@
local_repo = local_bzrdir.open_repository()
self.assertEqual(remote_backing_repo._format, local_repo._format)
+ # XXX: this helper probably belongs on TestCaseWithTransport
+ def make_smart_server(self, path):
+ smart_server = server.SmartTCPServer_for_testing()
+ smart_server.setUp(self.get_server())
+ remote_transport = get_transport(smart_server.get_url()).clone(path)
+ self.addCleanup(smart_server.tearDown)
+ return remote_transport
+
+ def test_clone_to_hpss(self):
+ pre_metadir_formats = [RepositoryFormat5(), RepositoryFormat6()]
+ if self.repository_format in pre_metadir_formats:
+ raise TestNotApplicable(
+ "Cannot lock pre_metadir_formats remotely.")
+ remote_transport = self.make_smart_server('remote')
+ local_branch = self.make_branch('local')
+ remote_branch = local_branch.create_clone_on_transport(remote_transport)
+ self.assertEqual(
+ local_branch.repository._format.supports_external_lookups,
+ remote_branch.repository._format.supports_external_lookups)
+
def test_clone_unstackable_branch_preserves_stackable_repo_format(self):
"""Cloning an unstackable branch format to a somewhere with a default
stack-on branch preserves the repository format. (i.e. if the source
=== modified file 'bzrlib/tests/per_repository_reference/__init__.py'
--- a/bzrlib/tests/per_repository_reference/__init__.py 2009-03-11 06:50:16 +0000
+++ b/bzrlib/tests/per_repository_reference/__init__.py 2009-03-13 04:36:06 +0000
@@ -26,7 +26,9 @@
repository,
remote,
)
+from bzrlib.branch import BzrBranchFormat7
from bzrlib.bzrdir import BzrDir
+from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack6
from bzrlib.tests import multiply_tests
from bzrlib.tests.per_repository import (
all_repository_format_scenarios,
@@ -69,11 +71,19 @@
"""
result = []
for test_name, scenario_info in all_repository_format_scenarios():
- # For remote repositories, we need at least one external reference
- # capable format to test it: defer this until landing such a format.
- # if isinstance(format, remote.RemoteRepositoryFormat):
- # scenario[1]['bzrdir_format'].repository_format =
- if scenario_info['repository_format'].supports_external_lookups:
+ format = scenario_info['repository_format']
+ if isinstance(format, remote.RemoteRepositoryFormat):
+ # This is a RemoteRepositoryFormat scenario. Force the scenario to
+ # use real branch and repository formats that support references.
+ scenario_info = dict(scenario_info)
+ format = remote.RemoteRepositoryFormat()
+ format._custom_format = RepositoryFormatKnitPack6()
+ scenario_info['repository_format'] = format
+ bzrdir_format = remote.RemoteBzrDirFormat()
+ bzrdir_format.repository_format = format
+ bzrdir_format.set_branch_format(BzrBranchFormat7())
+ scenario_info['bzrdir_format'] = bzrdir_format
+ if format.supports_external_lookups:
result.append((test_name, scenario_info))
return result
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py 2009-03-06 12:22:29 +0000
+++ b/bzrlib/tests/test_bzrdir.py 2009-03-13 04:36:06 +0000
@@ -59,7 +59,7 @@
from bzrlib.transport.memory import MemoryServer
from bzrlib.transport.nosmart import NoSmartTransportDecorator
from bzrlib.transport.readonly import ReadonlyTransportDecorator
-from bzrlib.repofmt import knitrepo, weaverepo
+from bzrlib.repofmt import knitrepo, weaverepo, pack_repo
class TestDefaultFormat(TestCase):
@@ -466,6 +466,18 @@
self.assertEqual(child_branch.base,
new_child.open_branch().get_stacked_on_url())
+ def test_default_stacking_with_stackable_branch_unstackable_repo(self):
+ # Make stackable source branch with an unstackable repo format.
+ source_bzrdir = self.make_bzrdir('source')
+ pack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
+ source_branch = bzrlib.branch.BzrBranchFormat7().initialize(source_bzrdir)
+ # Make a directory with a default stacking policy
+ parent_bzrdir = self.make_bzrdir('parent')
+ stacked_on = self.make_branch('parent/stacked-on', format='pack-0.92')
+ parent_bzrdir.get_config().set_default_stack_on(stacked_on.base)
+ # Clone source into directory
+ target = source_bzrdir.clone(self.get_url('parent/target'))
+
def test_sprout_obeys_stacking_policy(self):
child_branch, new_child_transport = self.prepare_default_stacking()
new_child = child_branch.bzrdir.sprout(new_child_transport.base)
=== modified file 'bzrlib/tests/test_fetch.py'
--- a/bzrlib/tests/test_fetch.py 2009-03-02 04:45:02 +0000
+++ b/bzrlib/tests/test_fetch.py 2009-03-13 04:36:06 +0000
@@ -330,21 +330,19 @@
class TestKnitToPackFetch(TestCaseWithTransport):
- def find_get_record_stream(self, calls):
- """In a list of calls, find 'get_record_stream' calls.
+ def find_get_record_stream(self, calls, expected_count=1):
+ """In a list of calls, find the last 'get_record_stream'.
- This also ensures that there is only one get_record_stream call.
+ :param expected_count: The number of calls we should exepect to find.
+ If a different number is found, an assertion is raised.
"""
get_record_call = None
+ call_count = 0
for call in calls:
if call[0] == 'get_record_stream':
- self.assertIs(None, get_record_call,
- "there should only be one call to"
- " get_record_stream")
+ call_count += 1
get_record_call = call
- self.assertIsNot(None, get_record_call,
- "there should be exactly one call to "
- " get_record_stream")
+ self.assertEqual(expected_count, call_count)
return get_record_call
def test_fetch_with_deltas_no_delta_closure(self):
@@ -370,8 +368,8 @@
target._format._fetch_order, False),
self.find_get_record_stream(source.texts.calls))
self.assertEqual(('get_record_stream', [('rev-one',)],
- target._format._fetch_order, False),
- self.find_get_record_stream(source.inventories.calls))
+ target._format._fetch_order, False),
+ self.find_get_record_stream(source.inventories.calls, 2))
self.assertEqual(('get_record_stream', [('rev-one',)],
target._format._fetch_order, False),
self.find_get_record_stream(source.revisions.calls))
@@ -414,8 +412,8 @@
target._format._fetch_order, True),
self.find_get_record_stream(source.texts.calls))
self.assertEqual(('get_record_stream', [('rev-one',)],
- target._format._fetch_order, True),
- self.find_get_record_stream(source.inventories.calls))
+ target._format._fetch_order, True),
+ self.find_get_record_stream(source.inventories.calls, 2))
self.assertEqual(('get_record_stream', [('rev-one',)],
target._format._fetch_order, True),
self.find_get_record_stream(source.revisions.calls))
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2009-03-11 06:50:04 +0000
+++ b/bzrlib/tests/test_remote.py 2009-03-13 04:36:06 +0000
@@ -51,6 +51,11 @@
from bzrlib.smart import server, medium
from bzrlib.smart.client import _SmartClient
from bzrlib.symbol_versioning import one_four
+from bzrlib.tests import (
+ condition_isinstance,
+ split_suite_by_condition,
+ multiply_tests,
+ )
from bzrlib.transport import get_transport, http
from bzrlib.transport.memory import MemoryTransport
from bzrlib.transport.remote import (
@@ -59,11 +64,20 @@
RemoteTCPTransport,
)
+def load_tests(standard_tests, module, loader):
+ to_adapt, result = split_suite_by_condition(
+ standard_tests, condition_isinstance(BasicRemoteObjectTests))
+ smart_server_version_scenarios = [
+ ('HPSS-v2',
+ {'transport_server': server.SmartTCPServer_for_testing_v2_only}),
+ ('HPSS-v3',
+ {'transport_server': server.SmartTCPServer_for_testing})]
+ return multiply_tests(to_adapt, smart_server_version_scenarios, result)
+
class BasicRemoteObjectTests(tests.TestCaseWithTransport):
def setUp(self):
- self.transport_server = server.SmartTCPServer_for_testing
super(BasicRemoteObjectTests, self).setUp()
self.transport = self.get_transport()
# make a branch that can be opened over the smart transport
@@ -123,6 +137,19 @@
b = BzrDir.open_from_transport(t.clone('stackable')).open_branch()
self.assertTrue(b._format.supports_stacking())
+ def test_remote_repo_format_supports_external_references(self):
+ t = self.transport
+ bd = self.make_bzrdir('unstackable', format='pack-0.92')
+ r = bd.create_repository()
+ self.assertFalse(r._format.supports_external_lookups)
+ r = BzrDir.open_from_transport(t.clone('unstackable')).open_repository()
+ self.assertFalse(r._format.supports_external_lookups)
+ bd = self.make_bzrdir('stackable', format='1.9')
+ r = bd.create_repository()
+ self.assertTrue(r._format.supports_external_lookups)
+ r = BzrDir.open_from_transport(t.clone('stackable')).open_repository()
+ self.assertTrue(r._format.supports_external_lookups)
+
class FakeProtocol(object):
"""Lookalike SmartClientRequestProtocolOne allowing body reading tests."""
@@ -876,7 +903,9 @@
'success', ('ok', vfs_url))
bzrdir = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
_client=client)
- branch = RemoteBranch(bzrdir, RemoteRepository(bzrdir, None),
+ repo_fmt = remote.RemoteRepositoryFormat()
+ repo_fmt._custom_format = stacked_branch.repository._format
+ branch = RemoteBranch(bzrdir, RemoteRepository(bzrdir, repo_fmt),
_client=client)
result = branch.get_stacked_on_url()
self.assertEqual(vfs_url, result)
@@ -893,7 +922,7 @@
'success', ('branch', branch_network_name))
client.add_expected_call(
'BzrDir.find_repositoryV3', ('stacked/',),
- 'success', ('ok', '', 'no', 'no', 'no',
+ 'success', ('ok', '', 'no', 'no', 'yes',
stacked_branch.repository._format.network_name()))
# called twice, once from constructor and then again by us
client.add_expected_call(
@@ -929,7 +958,7 @@
'success', ('branch', branch_network_name))
client.add_expected_call(
'BzrDir.find_repositoryV3', ('stacked/',),
- 'success', ('ok', '', 'no', 'no', 'no', network_name))
+ 'success', ('ok', '', 'no', 'no', 'yes', network_name))
# called twice, once from constructor and then again by us
client.add_expected_call(
'Branch.get_stacked_on_url', ('stacked/',),
=== modified file 'bzrlib/transport/http/__init__.py'
--- a/bzrlib/transport/http/__init__.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/transport/http/__init__.py 2009-03-10 04:57:28 +0000
@@ -622,6 +622,14 @@
raise errors.SmartProtocolError(str(e))
return body_filelike
+ def _report_activity(self, bytes, direction):
+ """See SmartMedium._report_activity.
+
+ Does nothing; the underlying plain HTTP transport will report the
+ activity that this medium would report.
+ """
+ pass
+
# TODO: May be better located in smart/medium.py with the other
# SmartMediumRequest classes
=== modified file 'bzrlib/transport/remote.py'
--- a/bzrlib/transport/remote.py 2009-02-26 04:25:00 +0000
+++ b/bzrlib/transport/remote.py 2009-03-10 04:57:28 +0000
@@ -136,6 +136,14 @@
# No credentials
return None, None
+ def _report_activity(self, bytes, direction):
+ """See Transport._report_activity.
+
+ Does nothing; the smart medium will report activity triggered by a
+ RemoteTransport.
+ """
+ pass
+
def is_readonly(self):
"""Smart server transport can do read/write file operations."""
try:
=== modified file 'bzrlib/weave.py'
--- a/bzrlib/weave.py 2009-02-23 15:29:35 +0000
+++ b/bzrlib/weave.py 2009-03-13 04:36:06 +0000
@@ -575,10 +575,7 @@
version_ids = self.versions()
version_ids = set(version_ids)
for lineno, inserted, deletes, line in self._walk_internal(version_ids):
- # if inserted not in version_ids then it was inserted before the
- # versions we care about, but because weaves cannot represent ghosts
- # properly, we do not filter down to that
- # if inserted not in version_ids: continue
+ if inserted not in version_ids: continue
if line[-1] != '\n':
yield line + '\n', inserted
else:
More information about the bazaar-commits
mailing list