Rev 4392: (jam) Fix bug #373455, allow --dev6 repos to stack. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri May 29 12:26:38 BST 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4392
revision-id: pqm at pqm.ubuntu.com-20090529112630-p1bfpivkz3igjzn2
parent: pqm at pqm.ubuntu.com-20090529103434-04tivhvlg6aohfkj
parent: john at arbash-meinel.com-20090529102537-rn7dnbrgu611uvkr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-05-29 12:26:30 +0100
message:
(jam) Fix bug #373455, allow --dev6 repos to stack.
added:
bzrlib/tests/per_repository_reference/test_fetch.py test_fetch.py-20090511214909-25pkgmoam913lrji-1
bzrlib/tests/per_repository_reference/test_initialize.py test_initialize.py-20090527083941-4rz2urcthjet5e2i-1
bzrlib/tests/per_repository_reference/test_unlock.py test_unlock.py-20090526160031-14lvypj5pbrndnyz-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/groupcompress.py groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
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/per_repository_reference/test_default_stacking.py test_default_stackin-20090311055345-9ajahgm58oq3wh6h-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_groupcompress.py test_groupcompress.p-20080705181503-ccbxd6xuy1bdnrpu-13
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 4343.3.39
revision-id: john at arbash-meinel.com-20090529102537-rn7dnbrgu611uvkr
parent: john at arbash-meinel.com-20090529101420-kyptmgbgh152p90t
parent: pqm at pqm.ubuntu.com-20090528185655-uip7we14796b5c8j
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Fri 2009-05-29 05:25:37 -0500
message:
Merge bzr.dev
added:
bzrlib/send.py send.py-20090521192735-j7cdb33ykmtmzx4w-1
renamed:
bzrlib/tests/workingtree_implementations/test_get_file_with_stat.py => bzrlib/tests/tree_implementations/test_get_file_with_stat.py test_get_file_with_s-20080922035909-lhdovrr36jpxmu0v-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/groupcompress.py groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/tests/tree_implementations/test_get_file_with_stat.py test_get_file_with_s-20080922035909-lhdovrr36jpxmu0v-1
------------------------------------------------------------
revno: 4343.3.38
revision-id: john at arbash-meinel.com-20090529101420-kyptmgbgh152p90t
parent: john at arbash-meinel.com-20090529095925-d1cvs7nugqh3iy48
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Fri 2009-05-29 05:14:20 -0500
message:
Add NEWS entry for fixing bug #373455
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4343.3.37
revision-id: john at arbash-meinel.com-20090529095925-d1cvs7nugqh3iy48
parent: john at arbash-meinel.com-20090529095612-3gk6e3dcc04t3gp2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Fri 2009-05-29 04:59:25 -0500
message:
A bit more review feedback from Andrew.
modified:
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 4343.3.36
revision-id: john at arbash-meinel.com-20090529095612-3gk6e3dcc04t3gp2
parent: john at arbash-meinel.com-20090528114614-32thxqc41pshgjih
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Fri 2009-05-29 04:56:12 -0500
message:
Some review feedback from Andrew.
Also found that BzrDir.initialize_on_transport_ex(Remote) is actually quite
broken for non-default formats.
modified:
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/tests/per_repository_reference/test_fetch.py test_fetch.py-20090511214909-25pkgmoam913lrji-1
bzrlib/tests/per_repository_reference/test_initialize.py test_initialize.py-20090527083941-4rz2urcthjet5e2i-1
------------------------------------------------------------
revno: 4343.3.35
revision-id: john at arbash-meinel.com-20090528114614-32thxqc41pshgjih
parent: john at arbash-meinel.com-20090528093715-x94ufmai2p3q6rse
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Thu 2009-05-28 06:46:14 -0500
message:
Remove some debugging note() and mutter() calls.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 4343.3.34
revision-id: john at arbash-meinel.com-20090528093715-x94ufmai2p3q6rse
parent: john at arbash-meinel.com-20090528093553-86qvzt9lqvazkw6m
parent: john at arbash-meinel.com-20090527123748-93evbgmi5uel4wlp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Thu 2009-05-28 04:37:15 -0500
message:
Merge the assert fix
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 4379.2.4
revision-id: john at arbash-meinel.com-20090527123748-93evbgmi5uel4wlp
parent: john at arbash-meinel.com-20090527084927-q18re4h7ewnluqp6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.16-bug375496
timestamp: Wed 2009-05-27 07:37:48 -0500
message:
Remove an assert that Vila caught.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 4343.3.33
revision-id: john at arbash-meinel.com-20090528093553-86qvzt9lqvazkw6m
parent: john at arbash-meinel.com-20090528083104-zjgfxrmodt5p3805
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Thu 2009-05-28 04:35:53 -0500
message:
Clear KeyDependencies on abort/suspend/commit_write_group.
This helps the chk repository tests pass, since otherwise they were 'accidentally'
filling in a ghost, because it remembered the ghost was there from
a previous commit.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 4343.3.32
revision-id: john at arbash-meinel.com-20090528083104-zjgfxrmodt5p3805
parent: john at arbash-meinel.com-20090528072506-kisr8v6xng5ii33q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Thu 2009-05-28 03:31:04 -0500
message:
Change the tests for _find_revision_outside_set to the new _find_parent_ids function.
The new function returns all parents, and doesn't try to filter out ghosts.
It also returns an empty set, rather than NULL_REVISION when there isn't anything.
modified:
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 4343.3.31
revision-id: john at arbash-meinel.com-20090528072506-kisr8v6xng5ii33q
parent: john at arbash-meinel.com-20090527153912-rmlhgzxx12zqw33e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Thu 2009-05-28 02:25:06 -0500
message:
Fix the test_fileid_involved test so that we don't take a write lock if we are going to skip the test.
modified:
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
------------------------------------------------------------
revno: 4343.3.30
revision-id: john at arbash-meinel.com-20090527153912-rmlhgzxx12zqw33e
parent: john at arbash-meinel.com-20090527151145-j31hsa0gaobkfqfi
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Wed 2009-05-27 10:39:12 -0500
message:
Add tests that when resuming a write group, we start checking if
there are missing texts, in order to determine if there are missing inventories.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
------------------------------------------------------------
revno: 4343.3.29
revision-id: john at arbash-meinel.com-20090527151145-j31hsa0gaobkfqfi
parent: john at arbash-meinel.com-20090527142522-hsubxpz3p8ws1oyu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Wed 2009-05-27 10:11:45 -0500
message:
Add 'check_for_missing_texts' flag to get_missing_parent_inv..
This lets us enable/disable the call to fileid_altered_by.
The main win is that for something like stacked, it is extra work that
won't likely give us benefit on the first pass, and would 'break' for
chk repositories anyway.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/per_repository_reference/test_fetch.py test_fetch.py-20090511214909-25pkgmoam913lrji-1
------------------------------------------------------------
revno: 4343.3.28
revision-id: john at arbash-meinel.com-20090527142522-hsubxpz3p8ws1oyu
parent: john at arbash-meinel.com-20090527135401-3ou4z879t5g146m8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Wed 2009-05-27 09:25:22 -0500
message:
We only need to return the inventories we don't have.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 4343.3.27
revision-id: john at arbash-meinel.com-20090527135401-3ou4z879t5g146m8
parent: john at arbash-meinel.com-20090527134842-76yv9s3tt8xgs8wn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Wed 2009-05-27 08:54:01 -0500
message:
Now that dev6 supports external references, the tests for
serializer compatibility need to be updated.
modified:
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 4343.3.26
revision-id: john at arbash-meinel.com-20090527134842-76yv9s3tt8xgs8wn
parent: john at arbash-meinel.com-20090527094033-n5p3ypfvcttxcdpi
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Wed 2009-05-27 08:48:42 -0500
message:
Handle get_stream when a parent is actually a ghost.
Basically, just filter out ghosts from the iter_inventories call,
though logically, we'd rather just skip the absent inventories inside
the _iter_inventories code.
modified:
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
------------------------------------------------------------
revno: 4343.3.25
revision-id: john at arbash-meinel.com-20090527094033-n5p3ypfvcttxcdpi
parent: john at arbash-meinel.com-20090526132151-2z422o7m5u4695ix
parent: john at arbash-meinel.com-20090527084927-q18re4h7ewnluqp6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Wed 2009-05-27 04:40:33 -0500
message:
Merge in bug fix for #375496
added:
bzrlib/_rio_py.py _rio_py.py-20090514104624-ied3d39oju8anmfz-1
bzrlib/_rio_pyx.pyx _rio_pyx.pyx-20090514104636-8203jcqvfny56yrd-1
bzrlib/tests/per_repository_reference/test_initialize.py test_initialize.py-20090527083941-4rz2urcthjet5e2i-1
bzrlib/tests/per_repository_reference/test_unlock.py test_unlock.py-20090526160031-14lvypj5pbrndnyz-1
bzrlib/tests/test__rio.py test__rio.py-20090514191748-cy74k8yj46gzoeq6-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
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/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/chk_map.py chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/foreign.py foreign.py-20081112170002-olsxmandkk8qyfuq-1
bzrlib/help_topics/en/eol.txt eol.txt-20090327060429-todzdjmqt3bpv5r8-3
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
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/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_dpush.py test_dpush.py-20090108125928-st1td6le59g0vyv2-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/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test_chk_map.py test_chk_map.py-20081001014447-ue6kkuhofvdecvxa-2
bzrlib/tests/test_foreign.py test_foreign.py-20081125004048-ywb901edgp9lluxo-1
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
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/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 4379.2.3
revision-id: john at arbash-meinel.com-20090527084927-q18re4h7ewnluqp6
parent: john at arbash-meinel.com-20090527084632-jfs47silmrswlgvd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.16-bug375496
timestamp: Wed 2009-05-27 03:49:27 -0500
message:
NEWS entry for fixing bug #375496
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4379.2.2
revision-id: john at arbash-meinel.com-20090527084632-jfs47silmrswlgvd
parent: john at arbash-meinel.com-20090526160150-qdzmyngm8p2726nh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.16-bug375496
timestamp: Wed 2009-05-27 03:46:32 -0500
message:
Change the Repository.add_fallback_repository() contract slightly.
So the final statement for fallback repositories is:
1) When transitioning from unlocked => locked, we will lock the fallback repos
2) When transitioning from locked => unlocked, we will unlock the fallback repos
3) If self.is_locked(), add_fallback_repository() will lock the fallback repo,
which will match (2) when self is finally unlocked.
Callers of add_fallback_repository() maintain their responsibility to match
every lock that they perform with a corresponding unlock.
added:
bzrlib/tests/per_repository_reference/test_initialize.py test_initialize.py-20090527083941-4rz2urcthjet5e2i-1
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/per_repository_reference/test_unlock.py test_unlock.py-20090526160031-14lvypj5pbrndnyz-1
------------------------------------------------------------
revno: 4379.2.1
revision-id: john at arbash-meinel.com-20090526160150-qdzmyngm8p2726nh
parent: pqm at pqm.ubuntu.com-20090523064024-0o95iuqvh8wj2zuz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.16-bug375496
timestamp: Tue 2009-05-26 11:01:50 -0500
message:
Change the fallback repository code to only lock/unlock on transition.
Update Remote to also do the same.
Teach Remote to properly handle _real_repository also unlocking on transition.
added:
bzrlib/tests/per_repository_reference/test_unlock.py test_unlock.py-20090526160031-14lvypj5pbrndnyz-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/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
------------------------------------------------------------
revno: 4343.3.24
revision-id: john at arbash-meinel.com-20090526132151-2z422o7m5u4695ix
parent: john at arbash-meinel.com-20090526100817-chhskf21s6bcra2p
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Tue 2009-05-26 08:21:51 -0500
message:
Add a test that file_ids goes to fallbacks appropriately.
Turns out this breaks because of bug #375496.
modified:
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
------------------------------------------------------------
revno: 4343.3.23
revision-id: john at arbash-meinel.com-20090526100817-chhskf21s6bcra2p
parent: john at arbash-meinel.com-20090512202508-a68i4ws1hgvdyqcd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Tue 2009-05-26 05:08:17 -0500
message:
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
This also allows us to get rid of _find_text_keys_to_fetch, since fileids_altered now
conforms to what we expect.
We need to update it to properly handle what should happen with stacked repositories.
modified:
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
------------------------------------------------------------
revno: 4343.3.22
revision-id: john at arbash-meinel.com-20090512202508-a68i4ws1hgvdyqcd
parent: john at arbash-meinel.com-20090512201521-x55cevhrk6bvqgln
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Tue 2009-05-12 15:25:08 -0500
message:
Remove accidental 'pdb.set_trace()'
modified:
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 4343.3.21
revision-id: john at arbash-meinel.com-20090512201521-x55cevhrk6bvqgln
parent: john at arbash-meinel.com-20090512185215-htefgi5pj1cz39r3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Tue 2009-05-12 15:15:21 -0500
message:
Implement get_missing_parents in terms of _KeyRefs.
This gives _GCGraphIndex a _key_dependencies variable.
Things still fail, because get_missing_parent_inventories() assumes that
fileids_altered_by_revision_ids will return file_ids for revisions
outside of the actual revisions requested.
CHKInventoryRepository actually explicitly eliminates those keys.
We may just need a custom get_missing_parent_inventories, but one
way or another we have issues.
modified:
bzrlib/groupcompress.py groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_groupcompress.py test_groupcompress.p-20080705181503-ccbxd6xuy1bdnrpu-13
------------------------------------------------------------
revno: 4343.3.20
revision-id: john at arbash-meinel.com-20090512185215-htefgi5pj1cz39r3
parent: john at arbash-meinel.com-20090512165814-sk2djs5robeg5tdx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Tue 2009-05-12 13:52:15 -0500
message:
Copy the track_external_parent_refs tests over to GCVF.
Of course, the new format doesn't actually need to implement _key_dependencies in
order to do this.
There really should be a direct test on KnitVersionedFiles if we are going to be
using _index._key_dependencies as an outside VF API. (not quite public, but accessed
directly from the Repo.)
modified:
bzrlib/tests/test_groupcompress.py test_groupcompress.p-20080705181503-ccbxd6xuy1bdnrpu-13
------------------------------------------------------------
revno: 4343.3.19
revision-id: john at arbash-meinel.com-20090512165814-sk2djs5robeg5tdx
parent: john at arbash-meinel.com-20090512165453-6ayhyzvok0vhfj2k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Tue 2009-05-12 11:58:14 -0500
message:
NEWS update for fixing bug #373455
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 4343.3.18
revision-id: john at arbash-meinel.com-20090512165453-6ayhyzvok0vhfj2k
parent: john at arbash-meinel.com-20090512154559-3fowmks3tzg2s6z6
parent: pqm at pqm.ubuntu.com-20090512090530-v9355ohetp61ltc1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Tue 2009-05-12 11:54:53 -0500
message:
merge bzr.dev 4354 to get the latest NEWS
removed:
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
renamed:
doc/developers/HACKING.txt => doc/en/developer-guide/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
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/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
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_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
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_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_rename_map.py test_rename_map.py-20090312140439-xexkkmjlg2enbohc-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
doc/en/developer-guide/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 4343.3.17
revision-id: john at arbash-meinel.com-20090512154559-3fowmks3tzg2s6z6
parent: john at arbash-meinel.com-20090512151900-e0l9n90ceu3qpp0c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Tue 2009-05-12 10:45:59 -0500
message:
Finally found a way to write a test case to exercise the code path.
The issue is that branch.bzrdir.sprout('target') does not actually use
PendingAncestryResult, you have to supply a revision-id.
So it required:
1) --dev6 format
2) branching from a stacked branch
3) stacked branch was across HPSS
4) Branching with a specific revision id
I guess I'm not too suprised it wasn't caught earlier.
Though it also hints that we need some clearer interfaces.
I guess the problem is that when branching a stacked branch locally,
we don't clear fallback_vfs, whereas when doing it from a remote
location, we don't have fallback_vfs, and instead have a chained
set of fetches.
modified:
bzrlib/tests/per_repository_reference/test_fetch.py test_fetch.py-20090511214909-25pkgmoam913lrji-1
------------------------------------------------------------
revno: 4343.3.16
revision-id: john at arbash-meinel.com-20090512151900-e0l9n90ceu3qpp0c
parent: john at arbash-meinel.com-20090512151753-nrmbsfw72dheplit
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Tue 2009-05-12 10:19:00 -0500
message:
Change test_default_stacking to use the existing 'make_smart_server' code.
With added benefit that this properly cleans up the smart server
modified:
bzrlib/tests/per_repository_reference/test_default_stacking.py test_default_stackin-20090311055345-9ajahgm58oq3wh6h-1
------------------------------------------------------------
revno: 4343.3.15
revision-id: john at arbash-meinel.com-20090512151753-nrmbsfw72dheplit
parent: john at arbash-meinel.com-20090512145001-h4sy80p01nmkvt7f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Tue 2009-05-12 10:17:53 -0500
message:
remove test_chk_bytes, it wasn't being used anyway
removed:
bzrlib/tests/per_repository_reference/test_chk_bytes.py test_chk_bytes.py-20090511162147-09nazufujle6kh23-1
modified:
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
------------------------------------------------------------
revno: 4343.3.14
revision-id: john at arbash-meinel.com-20090512145001-h4sy80p01nmkvt7f
parent: john at arbash-meinel.com-20090512144929-bqxnf5r4bccva8eo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Tue 2009-05-12 09:50:01 -0500
message:
Remove bogus 'test_foo'
modified:
bzrlib/tests/per_repository_reference/test_chk_bytes.py test_chk_bytes.py-20090511162147-09nazufujle6kh23-1
------------------------------------------------------------
revno: 4343.3.13
revision-id: john at arbash-meinel.com-20090512144929-bqxnf5r4bccva8eo
parent: john at arbash-meinel.com-20090512025817-t70950h902f6d578
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Tue 2009-05-12 09:49:29 -0500
message:
Update the fetch tests to make sure we are properly testing a smart base branch
modified:
bzrlib/tests/per_repository_reference/test_fetch.py test_fetch.py-20090511214909-25pkgmoam913lrji-1
------------------------------------------------------------
revno: 4343.3.12
revision-id: john at arbash-meinel.com-20090512025817-t70950h902f6d578
parent: john at arbash-meinel.com-20090512022454-u9djpy6xlpvbm8nd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Mon 2009-05-11 21:58:17 -0500
message:
instead of trusting the Search, use a get_parent_map call.
We'll try to fix search up next.
modified:
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
------------------------------------------------------------
revno: 4343.3.11
revision-id: john at arbash-meinel.com-20090512022454-u9djpy6xlpvbm8nd
parent: john at arbash-meinel.com-20090511215701-atuywlzig3l2u5yr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Mon 2009-05-11 21:24:54 -0500
message:
Change PendingAncestryResult to strip ghosts from .get_keys()
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 4343.3.10
revision-id: john at arbash-meinel.com-20090511215701-atuywlzig3l2u5yr
parent: john at arbash-meinel.com-20090511213737-6huyzlypu4mwfs0k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Mon 2009-05-11 16:57:01 -0500
message:
Add a per_repository_reference test with real stacked repos.
This adds a test that sets up a stacked repository with an extra revision
versus the stacked-on location, and then asserts you can branch from this.
I would think this would be tested somewhere, but it wasn't a
per-repository-reference test, so when I broke the code, it didn't fail
an obvious test.
This now changes the code so that if there are no keys to be fetched for
the 'missing_keys', then it doesn't try to get a stream from that vf.
There wasn't any real reason to do so, and it avoids trying to get
a stream for chk_bytes when the vf doesn't exist.
added:
bzrlib/tests/per_repository_reference/test_fetch.py test_fetch.py-20090511214909-25pkgmoam913lrji-1
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
------------------------------------------------------------
revno: 4343.3.9
revision-id: john at arbash-meinel.com-20090511213737-6huyzlypu4mwfs0k
parent: john at arbash-meinel.com-20090511185915-syglc7tz3vsprwpu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Mon 2009-05-11 16:37:37 -0500
message:
Remove an accidental 'bork'.
Though it does show I was correct about the code not being used.
modified:
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
------------------------------------------------------------
revno: 4343.3.8
revision-id: john at arbash-meinel.com-20090511185915-syglc7tz3vsprwpu
parent: john at arbash-meinel.com-20090511182828-louh5kxdbdcddlem
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Mon 2009-05-11 13:59:15 -0500
message:
Some cleanup passes.
move test_resume_chk_bytes from per_repository_referece to test_pack_repository,
as it is a bit more implementation specific.
Make sure we don't allow get_stream_for_missing_keys() if we have a pending stream.
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/groupcompress.py groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 4343.3.7
revision-id: john at arbash-meinel.com-20090511182828-louh5kxdbdcddlem
parent: john at arbash-meinel.com-20090511180344-7lkvfs2h0wpvrsw5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Mon 2009-05-11 13:28:28 -0500
message:
Update the suspend/resume/commit/abort_write_group tests for CHK1.
It turns out that the parameterized tests weren't actually parameterized,
always only using the default format.
Added a test that 'commit_write_group()' also doesn't leave any detritus around
in upload, and puts things into packs and indices correctly.
Updated the 'suspend' test to test that all indices are present, and not
just that the .pack file is.
Updated the ResumedPack.finish() and ResumedPack.abort() to handle .cix entries.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 4343.3.6
revision-id: john at arbash-meinel.com-20090511180344-7lkvfs2h0wpvrsw5
parent: john at arbash-meinel.com-20090511162826-u576zm0hxp2yqukw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Mon 2009-05-11 13:03:44 -0500
message:
Take out the _delta_across_repos flag.
Instead, we now check that the either commit_write_group fails,
or get_record_stream(..., True) succeeds.
Also, change the make_source_with_delta_record so that it generates
the closest thing to a delta for chk formats.
We have to use 'insert_record_stream', because 'add_lines' doesn't
delta for chk formats.
modified:
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
------------------------------------------------------------
revno: 4343.3.5
revision-id: john at arbash-meinel.com-20090511162826-u576zm0hxp2yqukw
parent: john at arbash-meinel.com-20090511162537-nyq502sr1eyvomdm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Mon 2009-05-11 11:28:26 -0500
message:
small comment
modified:
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 4343.3.4
revision-id: john at arbash-meinel.com-20090511162537-nyq502sr1eyvomdm
parent: john at arbash-meinel.com-20090511151829-vdk953uo4c47bmyc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Mon 2009-05-11 11:25:37 -0500
message:
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
This now ensures that all referenced chk pages will be transmitted when
we are requested to send missing inventories.
Also, adding a file to use for testing 'chk_bytes' specific information
when testing stacking.
added:
bzrlib/tests/per_repository_reference/test_chk_bytes.py test_chk_bytes.py-20090511162147-09nazufujle6kh23-1
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 4343.3.3
revision-id: john at arbash-meinel.com-20090511151829-vdk953uo4c47bmyc
parent: john at arbash-meinel.com-20090508180639-478y2rhwmvay3qpv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Mon 2009-05-11 10:18:29 -0500
message:
Be sure to check for missing compression parents in chk_bytes
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 4343.3.2
revision-id: john at arbash-meinel.com-20090508180639-478y2rhwmvay3qpv
parent: john at arbash-meinel.com-20090508163701-dewi8koteoyjbem6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Fri 2009-05-08 13:06:39 -0500
message:
All stacking tests seem to be passing for dev6 repos
1) Add _GCGraphIndex.scan_unvalidated_index()
It currently is a no-op because we
a) Don't cache the possible external parent references
b) Don't have external compression parents, so we can't have
missing compression parents that we need to scan either.
2) Introduce a .resumed_pack_factory and ResumedGCPack
We only need this to handle the fact that '_get_external_refs' is
always empty. It would probably be nicer if we could do this with
a different flag..
3) RepositoryFormat._deltas_across_repos
I needed a way to disable the 'cannot commit because we have a delta'
tests for GC repositories, because they currently have no way to
represent a delta between pack files. So I added this flag for now.
4) ResumedPack now properly supports chk_index, and we add a test
to ensure this fact.
modified:
bzrlib/groupcompress.py groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
------------------------------------------------------------
revno: 4343.3.1
revision-id: john at arbash-meinel.com-20090508163701-dewi8koteoyjbem6
parent: pqm at pqm.ubuntu.com-20090507174741-gavb04vy1c6s0w9n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.15-gc-stacking
timestamp: Fri 2009-05-08 11:37:01 -0500
message:
Set 'supports_external_lookups=True' for dev6 repositories.
I'm choosing not to do a new format, since it is dev anyway...
At the moment, that means supporting 'suspend_write_group', and implementing
'_index.get_missing_parents'.
modified:
bzrlib/groupcompress.py groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
Diff too large for email (2016 lines, the limit is 1000).
More information about the bazaar-commits
mailing list