Rev 3814: Add 'PackRepository.autopack' RPC. (Andrew Bennetts) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Oct 31 04:02:59 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3814
revision-id: pqm at pqm.ubuntu.com-20081031040253-lqwvq5xf6rhnumii
parent: pqm at pqm.ubuntu.com-20081031031538-0ih0zi2owevf6fwu
parent: andrew.bennetts at canonical.com-20081031015931-5e72vlm8h2tajcs9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-10-31 04:02:53 +0000
message:
Add 'PackRepository.autopack' RPC. (Andrew Bennetts)
added:
bzrlib/smart/packrepository.py packrepository.py-20080527041253-a16a8qp4vy8qh8y6-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3801.1.21
revision-id: andrew.bennetts at canonical.com-20081031015931-5e72vlm8h2tajcs9
parent: andrew.bennetts at canonical.com-20081031015716-xxizi0n4selzzrvr
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 12:59:31 +1100
message:
Revert irrelevant change. (This was related to the check_references RPC)
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3801.1.20
revision-id: andrew.bennetts at canonical.com-20081031015716-xxizi0n4selzzrvr
parent: andrew.bennetts at canonical.com-20081031014006-z6lrl4d8rlhqbcee
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 12:57:16 +1100
message:
Return ('ok',) rather than an error the autopack RPC is used on a non-pack repo.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/packrepository.py packrepository.py-20080527041253-a16a8qp4vy8qh8y6-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3801.1.19
revision-id: andrew.bennetts at canonical.com-20081031014006-z6lrl4d8rlhqbcee
parent: andrew.bennetts at canonical.com-20081031013743-9h3x5gxbbijydobj
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 12:40:06 +1100
message:
Update measurement in NEWS file to reflect the extra round-trip caused by reload_pack_names.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3801.1.18
revision-id: andrew.bennetts at canonical.com-20081031013743-9h3x5gxbbijydobj
parent: andrew.bennetts at canonical.com-20081031011513-0s6qg6qhxnzv1j4j
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 12:37:43 +1100
message:
Add a test that ensures that the autopack RPC is actually used for all pack formats.
modified:
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 3801.1.17
revision-id: andrew.bennetts at canonical.com-20081031011513-0s6qg6qhxnzv1j4j
parent: andrew.bennetts at canonical.com-20081031011422-uhk8gkvt4xel4g21
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 12:15:13 +1100
message:
Expand comment, make the client more flexible about the RPC return values it can accept.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3801.1.16
revision-id: andrew.bennetts at canonical.com-20081031011422-uhk8gkvt4xel4g21
parent: andrew.bennetts at canonical.com-20081031004036-22u5z8ljww3h3egc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 12:14:22 +1100
message:
Fix bug introduced in the de-duplication that stopped the autopack RPC from being used.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3801.1.15
revision-id: andrew.bennetts at canonical.com-20081031004036-22u5z8ljww3h3egc
parent: andrew.bennetts at canonical.com-20081031004023-963lz01rdjhub22r
parent: pqm at pqm.ubuntu.com-20081030235342-3ttqulydt0irv350
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 11:40:36 +1100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
------------------------------------------------------------
revno: 3801.1.14
revision-id: andrew.bennetts at canonical.com-20081031004023-963lz01rdjhub22r
parent: andrew.bennetts at canonical.com-20081031001254-bx0dfvgrkmh33rsa
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 11:40:23 +1100
message:
Reduce duplication in InterPackToRemotePack.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3801.1.13
revision-id: andrew.bennetts at canonical.com-20081031001254-bx0dfvgrkmh33rsa
parent: andrew.bennetts at canonical.com-20081030155220-n7sc1wwwfbmvpp0a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 11:12:54 +1100
message:
Revert returning of pack-names from the RPC.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/smart/packrepository.py packrepository.py-20080527041253-a16a8qp4vy8qh8y6-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3801.1.12
revision-id: andrew.bennetts at canonical.com-20081030155220-n7sc1wwwfbmvpp0a
parent: andrew.bennetts at canonical.com-20081030154224-0sb476141nigdrqw
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 02:52:20 +1100
message:
Update RemoteRepository.autopack to use new self._call helper.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3801.1.11
revision-id: andrew.bennetts at canonical.com-20081030154224-0sb476141nigdrqw
parent: andrew.bennetts at canonical.com-20081030153957-u4kxygs124u0jqgl
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 02:42:24 +1100
message:
Extend NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3801.1.10
revision-id: andrew.bennetts at canonical.com-20081030153957-u4kxygs124u0jqgl
parent: andrew.bennetts at canonical.com-20081030152913-3gvqggurs3a6wdou
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 02:39:57 +1100
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3801.1.9
revision-id: andrew.bennetts at canonical.com-20081030152913-3gvqggurs3a6wdou
parent: andrew.bennetts at canonical.com-20081030135903-y21yuqch369qs83u
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 02:29:13 +1100
message:
Return the new pack-names data from the PackRepository.autopack RPC, cutting out one more round-trip.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/smart/packrepository.py packrepository.py-20080527041253-a16a8qp4vy8qh8y6-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3801.1.8
revision-id: andrew.bennetts at canonical.com-20081030135903-y21yuqch369qs83u
parent: andrew.bennetts at canonical.com-20081030034759-jz7jwoz8j0w6es1k
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Fri 2008-10-31 00:59:03 +1100
message:
Fix typo in bzrlib/repository.py
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3801.1.7
revision-id: andrew.bennetts at canonical.com-20081030034759-jz7jwoz8j0w6es1k
parent: andrew.bennetts at canonical.com-20081029214648-x8ajbq3ura2gy1t1
parent: pqm at pqm.ubuntu.com-20081029232846-uni2g702k01jmgvh
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Thu 2008-10-30 14:47:59 +1100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 3801.1.6
revision-id: andrew.bennetts at canonical.com-20081029214648-x8ajbq3ura2gy1t1
parent: andrew.bennetts at canonical.com-20081029213927-w349uqh8ya8293xv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Thu 2008-10-30 08:46:48 +1100
message:
Remove check_references RPC for now.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/packrepository.py packrepository.py-20080527041253-a16a8qp4vy8qh8y6-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
------------------------------------------------------------
revno: 3801.1.5
revision-id: andrew.bennetts at canonical.com-20081029213927-w349uqh8ya8293xv
parent: andrew.bennetts at canonical.com-20081029104248-cm1i6byb3ht8x2hh
parent: pqm at pqm.ubuntu.com-20081029070146-p1cqjt23zctbpg51
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Thu 2008-10-30 08:39:27 +1100
message:
Merge bzr.dev.
added:
doc/developers/btree_index_prefetch.txt btree_index_request_-20081004155340-2u6apsy53f43f0xn-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
------------------------------------------------------------
revno: 3801.1.4
revision-id: andrew.bennetts at canonical.com-20081029104248-cm1i6byb3ht8x2hh
parent: andrew.bennetts at canonical.com-20081028115837-nt7skjjsqq3j1apd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Wed 2008-10-29 21:42:48 +1100
message:
Add tests for autopack RPC.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/packrepository.py packrepository.py-20080527041253-a16a8qp4vy8qh8y6-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3801.1.3
revision-id: andrew.bennetts at canonical.com-20081028115837-nt7skjjsqq3j1apd
parent: andrew.bennetts at canonical.com-20081028055042-kr2z2vroqiljpse6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Tue 2008-10-28 22:58:37 +1100
message:
Make tests pass with autopack RPC (disable the check_references RPC for now).
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3801.1.2
revision-id: andrew.bennetts at canonical.com-20081028055042-kr2z2vroqiljpse6
parent: andrew.bennetts at canonical.com-20081028052824-c9eh2emnxp1g5bpy
parent: john at arbash-meinel.com-20081023210643-6pxsgdybl89n0tz9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Tue 2008-10-28 16:50:42 +1100
message:
Merge John's pack-retry fix.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3801.1.1
revision-id: andrew.bennetts at canonical.com-20081028052824-c9eh2emnxp1g5bpy
parent: pqm at pqm.ubuntu.com-20081027195553-876pyjww9zmjqj87
parent: andrew.bennetts at canonical.com-20080922062926-w8y7793926m7w20l
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: autopack-rpc
timestamp: Tue 2008-10-28 16:28:24 +1100
message:
Merge autopack RPC from push-improvement-loom.
added:
bzrlib/smart/packrepository.py packrepository.py-20080527041253-a16a8qp4vy8qh8y6-1
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3452.2.11
revision-id: andrew.bennetts at canonical.com-20080922062926-w8y7793926m7w20l
parent: andrew.bennetts at canonical.com-20080619063418-dugpj6nxq8dyhc52
parent: andrew.bennetts at canonical.com-20080625224023-o0uifuw9r14zbqcp
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: inter-remote-pack
timestamp: Mon 2008-09-22 16:29:26 +1000
message:
Merge thread.
removed:
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/tests/interversionedfile_implementations/ interversionedfile_implementations-20060301230427-f1f3ca8ddd5ff482
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/revisionstore_implementations/ revisionstore_implementations-20060303020702-1d2e36b63cef2706
bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
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/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
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/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
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/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/repository_implementations/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3452.2.10
revision-id: andrew.bennetts at canonical.com-20080619063418-dugpj6nxq8dyhc52
parent: andrew.bennetts at canonical.com-20080619043619-ykcqk6oh43pz42dm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: inter-remote-pack
timestamp: Thu 2008-06-19 16:34:18 +1000
message:
Remove and False.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3452.2.9
revision-id: andrew.bennetts at canonical.com-20080619043619-ykcqk6oh43pz42dm
parent: andrew.bennetts at canonical.com-20080619043537-vf33ef8j3ljvhxjy
parent: andrew.bennetts at canonical.com-20080619025112-wf4jpdp25lqk422y
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: inter-remote-pack
timestamp: Thu 2008-06-19 14:36:19 +1000
message:
Merge from smart-push-gpm.
added:
bzrlib/tests/blackbox/test_alias.py test_alias.py-20080425112253-fbt0yz1c1834jriz-1
bzrlib/tests/blackbox/test_modified.py test_modified.py-20080424085848-nwqjenan4dq2vq3w-1
bzrlib/tests/per_repository_reference/ repository_external_-20080220025549-nnm2s80it1lvcwnc-1
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
bzrlib/tests/per_repository_reference/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
bzrlib/tests/per_repository_reference/test_break_lock.py test_break_lock.py-20080220042825-1f48qmpnuqqp5wg2-1
bzrlib/tests/per_repository_reference/test_check.py test_check.py-20080220044229-sxxe747gzi6q8fyv-1
renamed:
doc/en/user-guide/revnos.txt => doc/en/user-guide/zen.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/counted_lock.py counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
bzrlib/decorators.py decorators.py-20060112082512-6bfc2d882df1698d
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
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/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-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/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
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_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
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_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_switch.py test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/fakenfs.py fakenfs.py-20060402223312-0e29c7275aa384dd
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
doc/en/user-guide/zen.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
------------------------------------------------------------
revno: 3452.2.8
revision-id: andrew.bennetts at canonical.com-20080619043537-vf33ef8j3ljvhxjy
parent: andrew.bennetts at canonical.com-20080527080139-mrwbi74gfi96wjpz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: inter-remote-pack
timestamp: Thu 2008-06-19 14:35:37 +1000
message:
Tidy some cruft.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3452.2.7
revision-id: andrew.bennetts at canonical.com-20080527080139-mrwbi74gfi96wjpz
parent: andrew.bennetts at canonical.com-20080527074352-q056boid7drrjzn7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: inter-remote-pack
timestamp: Tue 2008-05-27 18:01:39 +1000
message:
Elaborate on comment.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3452.2.6
revision-id: andrew.bennetts at canonical.com-20080527074352-q056boid7drrjzn7
parent: andrew.bennetts at canonical.com-20080527060439-nvwoxn0jz51kpqe3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: inter-remote-pack
timestamp: Tue 2008-05-27 17:43:52 +1000
message:
Batch get_parent_map calls in InterPackToRemotePack._walk_to_common_revisions to
reduce roundtrips.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3452.2.5
revision-id: andrew.bennetts at canonical.com-20080527060439-nvwoxn0jz51kpqe3
parent: andrew.bennetts at canonical.com-20080527054827-a6cu15s5zt640bzp
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: inter-remote-pack
timestamp: Tue 2008-05-27 16:04:39 +1000
message:
Remove more commented-out cruft.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3452.2.4
revision-id: andrew.bennetts at canonical.com-20080527054827-a6cu15s5zt640bzp
parent: andrew.bennetts at canonical.com-20080527053915-sm0kbsg0k1bli54f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: inter-remote-pack
timestamp: Tue 2008-05-27 15:48:27 +1000
message:
Fix an XXX and remove some commented cruft.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3452.2.3
revision-id: andrew.bennetts at canonical.com-20080527053915-sm0kbsg0k1bli54f
parent: andrew.bennetts at canonical.com-20080527041256-uuyg3kjmab9zc3gl
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: inter-remote-pack
timestamp: Tue 2008-05-27 15:39:15 +1000
message:
Remove some cruft.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3452.2.2
revision-id: andrew.bennetts at canonical.com-20080527041256-uuyg3kjmab9zc3gl
parent: andrew.bennetts at canonical.com-20080527023757-6tmwmstj70kyym4a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: inter-remote-pack
timestamp: Tue 2008-05-27 14:12:56 +1000
message:
Experimental PackRepository.{check_references,autopack} RPCs.
added:
bzrlib/smart/packrepository.py packrepository.py-20080527041253-a16a8qp4vy8qh8y6-1
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
------------------------------------------------------------
revno: 3452.2.1
revision-id: andrew.bennetts at canonical.com-20080527023757-6tmwmstj70kyym4a
parent: pqm at pqm.ubuntu.com-20080524120232-22xdromy706t0x16
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: inter-remote-pack
timestamp: Tue 2008-05-27 12:37:57 +1000
message:
An experimental InterRepo for remote packs.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'NEWS'
--- a/NEWS 2008-10-30 03:56:00 +0000
+++ b/NEWS 2008-10-31 01:40:06 +0000
@@ -44,6 +44,17 @@
* lp: lookups no longer include usernames, making them shareable and
shorter. (Aaron Bentley)
+ * New ``PackRepository.autopack`` smart server RPC, which does
+ autopacking entirely on the server. This is much faster than
+ autopacking via plain file methods, which downloads a large amount
+ of pack data and then re-uploads the same pack data into a single
+ file. This fixes a major (although infrequent) cause of lengthy
+ delays when using a smart server. For example, pushing the 10th
+ revision to a repository with 9 packs now takes 44 RPCs rather than
+ 179, and much less bandwidth too. This requires Bazaar 1.9 on both
+ the client and the server, otherwise the client will fallback to the
+ slower method. (Andrew Bennetts)
+
BUG FIXES:
* A failure to load a plugin due to an IncompatibleAPI exception is
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2008-10-30 15:20:00 +0000
+++ b/bzrlib/remote.py 2008-10-31 01:57:16 +0000
@@ -810,6 +810,8 @@
other, self).search_missing_revision_ids(revision_id, find_ghosts)
def fetch(self, source, revision_id=None, pb=None, find_ghosts=False):
+ # Not delegated to _real_repository so that InterRepository.get has a
+ # chance to find an InterRepository specialised for RemoteRepository.
if self.has_same_location(source):
# check that last_revision is in 'from' and then return a
# no-operation.
@@ -820,7 +822,6 @@
inter = repository.InterRepository.get(source, self)
try:
return inter.fetch(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts)
-
except NotImplementedError:
raise errors.IncompatibleRepositories(source, self)
@@ -1217,6 +1218,23 @@
count = str(recipe[2])
return '\n'.join((start_keys, stop_keys, count))
+ def autopack(self):
+ path = self.bzrdir._path_for_remote_call(self._client)
+ try:
+ response = self._call('PackRepository.autopack', path)
+ except errors.UnknownSmartMethod:
+ self._ensure_real()
+ self._real_repository._pack_collection.autopack()
+ return
+ if self._real_repository is not None:
+ # Reset the real repository's cache of pack names.
+ # XXX: At some point we may be able to skip this and just rely on
+ # the automatic retry logic to do the right thing, but for now we
+ # err on the side of being correct rather than being optimal.
+ self._real_repository._pack_collection.reload_pack_names()
+ if response[0] != 'ok':
+ raise errors.UnexpectedSmartServerResponse(response)
+
class RemoteBranchLockableFiles(LockableFiles):
"""A 'LockableFiles' implementation that talks to a smart server.
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2008-10-30 15:20:00 +0000
+++ b/bzrlib/repository.py 2008-10-31 01:14:22 +0000
@@ -2800,7 +2800,6 @@
fetcher = RepoFetcher(self.target, self.source, revision_id,
pb, find_ghosts)
return fetcher.count_copied, fetcher.failed_revisions
- from bzrlib.repofmt.pack_repo import Packer
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
self.source, self.source._format, self.target, self.target._format)
self.count_copied = 0
@@ -2814,7 +2813,8 @@
revision_ids = source_revision_ids - \
frozenset(self.target_get_parent_map(source_revision_ids))
revision_keys = [(revid,) for revid in revision_ids]
- index = self.target._pack_collection.revision_index.combined_index
+ target_pack_collection = self._get_target_pack_collection()
+ index = target_pack_collection.revision_index.combined_index
present_revision_ids = set(item[1][0] for item in
index.iter_entries(revision_keys))
revision_ids = set(revision_ids) - present_revision_ids
@@ -2836,19 +2836,31 @@
raise errors.InstallFailed([revision_id])
if len(revision_ids) == 0:
return (0, [])
- packs = self.source._pack_collection.all_packs()
- pack = Packer(self.target._pack_collection, packs, '.fetch',
+ return self._pack(self.source, self.target, revision_ids)
+
+ def _pack(self, source, target, revision_ids):
+ from bzrlib.repofmt.pack_repo import Packer
+ target_pack_collection = self._get_target_pack_collection()
+ packs = source._pack_collection.all_packs()
+ pack = Packer(target_pack_collection, packs, '.fetch',
revision_ids).pack()
if pack is not None:
- self.target._pack_collection._save_pack_names()
+ target_pack_collection._save_pack_names()
+ copied_revs = pack.get_revision_count()
# Trigger an autopack. This may duplicate effort as we've just done
# a pack creation, but for now it is simpler to think about as
# 'upload data, then repack if needed'.
- self.target._pack_collection.autopack()
- return (pack.get_revision_count(), [])
+ self._autopack()
+ return (copied_revs, [])
else:
return (0, [])
+ def _autopack(self):
+ self.target._pack_collection.autopack()
+
+ def _get_target_pack_collection(self):
+ return self.target._pack_collection
+
@needs_read_lock
def search_missing_revision_ids(self, revision_id=None, find_ghosts=True):
"""See InterRepository.missing_revision_ids().
@@ -3052,6 +3064,9 @@
class InterOtherToRemote(InterRepository):
+ """An InterRepository that simply delegates to the 'real' InterRepository
+ calculated for (source, target._real_repository).
+ """
_walk_to_common_revisions_batch_size = 50
@@ -3127,6 +3142,39 @@
+class InterPackToRemotePack(InterPackRepo):
+ """A specialisation of InterPackRepo for a target that is a
+ RemoteRepository.
+
+ This will use the get_parent_map RPC rather than plain readvs, and also
+ uses an RPC for autopacking.
+ """
+
+ _walk_to_common_revisions_batch_size = 50
+
+ @staticmethod
+ def is_compatible(source, target):
+ from bzrlib.repofmt.pack_repo import RepositoryFormatPack
+ if isinstance(source._format, RepositoryFormatPack):
+ if isinstance(target, remote.RemoteRepository):
+ target._ensure_real()
+ if isinstance(target._real_repository._format,
+ RepositoryFormatPack):
+ if InterRepository._same_model(source, target):
+ return True
+ return False
+
+ def _autopack(self):
+ self.target.autopack()
+
+ def _get_target_pack_collection(self):
+ return self.target._real_repository._pack_collection
+
+ @classmethod
+ def _get_repo_format_to_test(self):
+ return None
+
+
InterRepository.register_optimiser(InterDifferingSerializer)
InterRepository.register_optimiser(InterSameDataRepository)
InterRepository.register_optimiser(InterWeaveRepo)
@@ -3136,6 +3184,7 @@
InterRepository.register_optimiser(InterPackRepo)
InterRepository.register_optimiser(InterOtherToRemote)
InterRepository.register_optimiser(InterRemoteToOther)
+InterRepository.register_optimiser(InterPackToRemotePack)
class CopyConverter(object):
=== added file 'bzrlib/smart/packrepository.py'
--- a/bzrlib/smart/packrepository.py 1970-01-01 00:00:00 +0000
+++ b/bzrlib/smart/packrepository.py 2008-10-31 01:57:16 +0000
@@ -0,0 +1,45 @@
+# Copyright (C) 2008 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+"""Server-side pack repository related request implmentations."""
+
+from bzrlib.smart.request import (
+ FailedSmartServerResponse,
+ SuccessfulSmartServerResponse,
+ )
+
+
+from bzrlib.smart.repository import (
+ SmartServerRepositoryRequest,
+ )
+
+
+class SmartServerPackRepositoryAutopack(SmartServerRepositoryRequest):
+
+ def do_repository_request(self, repository):
+ pack_collection = getattr(repository, '_pack_collection', None)
+ if pack_collection is None:
+ # This is a not a pack repo, so asking for an autopack is just a
+ # no-op.
+ return SuccessfulSmartServerResponse(('ok',))
+ repository.lock_write()
+ try:
+ repository._pack_collection.autopack()
+ finally:
+ repository.unlock()
+ return SuccessfulSmartServerResponse(('ok',))
+
+
=== modified file 'bzrlib/smart/request.py'
--- a/bzrlib/smart/request.py 2008-10-16 05:54:43 +0000
+++ b/bzrlib/smart/request.py 2008-10-30 03:47:59 +0000
@@ -443,6 +443,9 @@
'readv', 'bzrlib.smart.vfs', 'ReadvRequest')
request_handlers.register_lazy(
'rename', 'bzrlib.smart.vfs', 'RenameRequest')
+request_handlers.register_lazy(
+ 'PackRepository.autopack', 'bzrlib.smart.packrepository',
+ 'SmartServerPackRepositoryAutopack')
request_handlers.register_lazy('Repository.gather_stats',
'bzrlib.smart.repository',
'SmartServerRepositoryGatherStats')
=== modified file 'bzrlib/tests/test_pack_repository.py'
--- a/bzrlib/tests/test_pack_repository.py 2008-10-23 19:39:59 +0000
+++ b/bzrlib/tests/test_pack_repository.py 2008-10-31 01:37:43 +0000
@@ -37,6 +37,10 @@
upgrade,
workingtree,
)
+from bzrlib.smart import (
+ client,
+ server,
+ )
from bzrlib.tests import (
TestCase,
TestCaseWithTransport,
@@ -627,6 +631,44 @@
self.assertTrue(large_pack_name in pack_names)
+class TestSmartServerAutopack(TestCaseWithTransport):
+
+ def setUp(self):
+ super(TestSmartServerAutopack, self).setUp()
+ # Create a smart server that publishes whatever the backing VFS server
+ # does.
+ self.smart_server = server.SmartTCPServer_for_testing()
+ self.smart_server.setUp(self.get_server())
+ self.addCleanup(self.smart_server.tearDown)
+ # Log all HPSS calls into self.hpss_calls.
+ client._SmartClient.hooks.install_named_hook(
+ 'call', self.capture_hpss_call, None)
+ self.hpss_calls = []
+
+ def capture_hpss_call(self, params):
+ self.hpss_calls.append(params.method)
+
+ def get_format(self):
+ return bzrdir.format_registry.make_bzrdir(self.format_name)
+
+ def test_autopack_rpc_is_used_when_using_hpss(self):
+ # Make local and remote repos
+ tree = self.make_branch_and_tree('local', format=self.get_format())
+ self.make_branch_and_tree('remote', format=self.get_format())
+ remote_branch_url = self.smart_server.get_url() + 'remote'
+ remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
+ # Make 9 local revisions, and push them one at a time to the remote
+ # repo to produce 9 pack files.
+ for x in range(9):
+ tree.commit('commit %s' % x)
+ tree.branch.push(remote_branch)
+ # Make one more push to trigger an autopack
+ self.hpss_calls = []
+ tree.commit('commit triggering pack')
+ tree.branch.push(remote_branch)
+ self.assertTrue('PackRepository.autopack' in self.hpss_calls)
+
+
def load_tests(basic_tests, module, test_loader):
# these give the bzrdir canned format name, and the repository on-disk
# format string
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2008-10-29 01:16:22 +0000
+++ b/bzrlib/tests/test_remote.py 2008-10-31 01:57:16 +0000
@@ -171,14 +171,7 @@
"""Lookalike for _SmartClient allowing testing."""
def __init__(self, fake_medium_base='fake base'):
- """Create a FakeClient.
-
- :param responses: A list of response-tuple, body-data pairs to be sent
- back to callers. A special case is if the response-tuple is
- 'unknown verb', then a UnknownSmartMethod will be raised for that
- call, using the second element of the tuple as the verb in the
- exception.
- """
+ """Create a FakeClient."""
self.responses = []
self._calls = []
self.expecting_body = False
@@ -1450,6 +1443,73 @@
src_repo.copy_content_into(dest_repo)
+class _StubRealPackRepository(object):
+
+ def __init__(self, calls):
+ self._pack_collection = _StubPackCollection(calls)
+
+
+class _StubPackCollection(object):
+
+ def __init__(self, calls):
+ self.calls = calls
+
+ def autopack(self):
+ self.calls.append(('pack collection autopack',))
+
+ def reload_pack_names(self):
+ self.calls.append(('pack collection reload_pack_names',))
+
+
+class TestRemotePackRepositoryAutoPack(TestRemoteRepository):
+ """Tests for RemoteRepository.autopack implementation."""
+
+ def test_ok(self):
+ """When the server returns 'ok' and there's no _real_repository, then
+ nothing else happens: the autopack method is done.
+ """
+ transport_path = 'quack'
+ repo, client = self.setup_fake_client_and_repository(transport_path)
+ client.add_expected_call(
+ 'PackRepository.autopack', ('quack/',), 'success', ('ok',))
+ repo.autopack()
+ client.finished_test()
+
+ def test_ok_with_real_repo(self):
+ """When the server returns 'ok' and there is a _real_repository, then
+ the _real_repository's reload_pack_name's method will be called.
+ """
+ transport_path = 'quack'
+ repo, client = self.setup_fake_client_and_repository(transport_path)
+ client.add_expected_call(
+ 'PackRepository.autopack', ('quack/',),
+ 'success', ('ok',))
+ repo._real_repository = _StubRealPackRepository(client._calls)
+ repo.autopack()
+ self.assertEqual(
+ [('call', 'PackRepository.autopack', ('quack/',)),
+ ('pack collection reload_pack_names',)],
+ client._calls)
+
+ def test_backwards_compatibility(self):
+ """If the server does not recognise the PackRepository.autopack verb,
+ fallback to the real_repository's implementation.
+ """
+ transport_path = 'quack'
+ repo, client = self.setup_fake_client_and_repository(transport_path)
+ client.add_unknown_method_response('PackRepository.autopack')
+ def stub_ensure_real():
+ client._calls.append(('_ensure_real',))
+ repo._real_repository = _StubRealPackRepository(client._calls)
+ repo._ensure_real = stub_ensure_real
+ repo.autopack()
+ self.assertEqual(
+ [('call', 'PackRepository.autopack', ('quack/',)),
+ ('_ensure_real',),
+ ('pack collection autopack',)],
+ client._calls)
+
+
class TestErrorTranslationBase(tests.TestCaseWithMemoryTransport):
"""Base class for unit tests for bzrlib.remote._translate_error."""
@@ -1483,7 +1543,7 @@
**context)
return translated_error
-
+
class TestErrorTranslationSuccess(TestErrorTranslationBase):
"""Unit tests for bzrlib.remote._translate_error.
@@ -1595,7 +1655,6 @@
self.assertEqual(expected_error, translated_error)
-
class TestErrorTranslationRobustness(TestErrorTranslationBase):
"""Unit tests for bzrlib.remote._translate_error's robustness.
=== modified file 'bzrlib/tests/test_repository.py'
--- a/bzrlib/tests/test_repository.py 2008-10-28 17:41:35 +0000
+++ b/bzrlib/tests/test_repository.py 2008-10-29 21:39:27 +0000
@@ -473,6 +473,7 @@
class DummyRepository(object):
"""A dummy repository for testing."""
+ _format = None
_serializer = None
def supports_rich_root(self):
=== modified file 'bzrlib/tests/test_smart.py'
--- a/bzrlib/tests/test_smart.py 2008-09-15 09:42:16 +0000
+++ b/bzrlib/tests/test_smart.py 2008-10-31 01:57:16 +0000
@@ -1037,6 +1037,53 @@
SmartServerResponse(('yes',)), response)
+class TestSmartServerPackRepositoryAutopack(tests.TestCaseWithTransport):
+
+ def make_repo_needing_autopacking(self, path='.'):
+ # Make a repo in need of autopacking.
+ tree = self.make_branch_and_tree('.', format='pack-0.92')
+ repo = tree.branch.repository
+ # monkey-patch the pack collection to disable autopacking
+ repo._pack_collection._max_pack_count = lambda count: count
+ for x in range(10):
+ tree.commit('commit %s' % x)
+ self.assertEqual(10, len(repo._pack_collection.names()))
+ del repo._pack_collection._max_pack_count
+ return repo
+
+ def test_autopack_needed(self):
+ repo = self.make_repo_needing_autopacking()
+ backing = self.get_transport()
+ request = smart.packrepository.SmartServerPackRepositoryAutopack(
+ backing)
+ response = request.execute('')
+ self.assertEqual(SmartServerResponse(('ok',)), response)
+ repo._pack_collection.reload_pack_names()
+ self.assertEqual(1, len(repo._pack_collection.names()))
+
+ def test_autopack_not_needed(self):
+ tree = self.make_branch_and_tree('.', format='pack-0.92')
+ repo = tree.branch.repository
+ for x in range(9):
+ tree.commit('commit %s' % x)
+ backing = self.get_transport()
+ request = smart.packrepository.SmartServerPackRepositoryAutopack(
+ backing)
+ response = request.execute('')
+ self.assertEqual(SmartServerResponse(('ok',)), response)
+ repo._pack_collection.reload_pack_names()
+ self.assertEqual(9, len(repo._pack_collection.names()))
+
+ def test_autopack_on_nonpack_format(self):
+ """A request to autopack a non-pack repo is a no-op."""
+ repo = self.make_repository('.', format='knit')
+ backing = self.get_transport()
+ request = smart.packrepository.SmartServerPackRepositoryAutopack(
+ backing)
+ response = request.execute('')
+ self.assertEqual(SmartServerResponse(('ok',)), response)
+
+
class TestHandlers(tests.TestCase):
"""Tests for the request.request_handlers object."""
@@ -1083,6 +1130,9 @@
smart.request.request_handlers.get('BzrDir.open_branch'),
smart.bzrdir.SmartServerRequestOpenBranch)
self.assertEqual(
+ smart.request.request_handlers.get('PackRepository.autopack'),
+ smart.packrepository.SmartServerPackRepositoryAutopack)
+ self.assertEqual(
smart.request.request_handlers.get('Repository.gather_stats'),
smart.repository.SmartServerRepositoryGatherStats)
self.assertEqual(
More information about the bazaar-commits
mailing list