Rev 3063: (John Arbash Meinel) Fix bug #165290: have pack=>pack fetch check for in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat Dec 1 00:10:59 GMT 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3063
revision-id:pqm at pqm.ubuntu.com-20071201001053-zi6k6s2817c1p97s
parent: pqm at pqm.ubuntu.com-20071130233349-86c0lwztw5vt2r17
parent: john at arbash-meinel.com-20071130224321-fa2utht4965q4tp8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-12-01 00:10:53 +0000
message:
(John Arbash Meinel) Fix bug #165290: have pack=>pack fetch check for
missing compression parents
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
------------------------------------------------------------
revno: 3035.2.8
revision-id:john at arbash-meinel.com-20071130224321-fa2utht4965q4tp8
parent: john at arbash-meinel.com-20071130224029-bpqrx0fjkify8w8p
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_check_parents_165290
timestamp: Fri 2007-11-30 16:43:21 -0600
message:
NEWS for bug #165290
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3035.2.7
revision-id:john at arbash-meinel.com-20071130224029-bpqrx0fjkify8w8p
parent: john at arbash-meinel.com-20071130221329-thu3lcbolzqliilw
parent: john at arbash-meinel.com-20071130223038-20vjbnd5dsjq0ci9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_check_parents_165290
timestamp: Fri 2007-11-30 16:40:29 -0600
message:
Merge in bzr.dev and updated NEWS for post 1.0rc1
added:
doc/en/tutorials/ docentutorials-20071127235845-bm2lu60bvau1ptmh-1
doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/best_practice_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/central_intro.txt central_intro.txt-20071123055134-k5x4ekduci2lbn36-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/distributed_intro.txt distributed_intro.tx-20071123154453-dk2mjhrg1vpjm5w2-2
doc/en/user-guide/entering_commands.txt using_bazaar.txt-20071114035000-q36a9h57ps06uvnl-6
doc/en/user-guide/getting_help.txt getting_help.txt-20071128000722-ncxiua259xwbdbg7-2
doc/en/user-guide/images/ images-20071114035000-q36a9h57ps06uvnl-3
doc/en/user-guide/images/workflows_centralized.png workflows_centralize-20071114035000-q36a9h57ps06uvnl-8
doc/en/user-guide/images/workflows_centralized.svg workflows_centralize-20071130043324-bhms0cgyphhq1b2x-1
doc/en/user-guide/images/workflows_gatekeeper.png workflows_gatekeeper-20071114035000-q36a9h57ps06uvnl-9
doc/en/user-guide/images/workflows_gatekeeper.svg workflows_gatekeeper-20071130043324-bhms0cgyphhq1b2x-2
doc/en/user-guide/images/workflows_localcommit.png workflows_localcommi-20071114035000-q36a9h57ps06uvnl-10
doc/en/user-guide/images/workflows_localcommit.svg workflows_localcommi-20071130043324-bhms0cgyphhq1b2x-3
doc/en/user-guide/images/workflows_peer.png workflows_peer.png-20071114035000-q36a9h57ps06uvnl-11
doc/en/user-guide/images/workflows_peer.svg workflows_peer.svg-20071130043324-bhms0cgyphhq1b2x-4
doc/en/user-guide/images/workflows_pqm.png workflows_pqm.png-20071114035000-q36a9h57ps06uvnl-12
doc/en/user-guide/images/workflows_pqm.svg workflows_pqm.svg-20071130043324-bhms0cgyphhq1b2x-5
doc/en/user-guide/images/workflows_shared.png workflows_shared.png-20071114035000-q36a9h57ps06uvnl-13
doc/en/user-guide/images/workflows_shared.svg workflows_shared.svg-20071130043324-bhms0cgyphhq1b2x-6
doc/en/user-guide/images/workflows_single.png workflows_single.png-20071114035000-q36a9h57ps06uvnl-14
doc/en/user-guide/images/workflows_single.svg workflows_single.svg-20071130043324-bhms0cgyphhq1b2x-7
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/merging_changes.txt merging_changes.txt-20071122141511-0knao2lklsdsvb1q-3
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
doc/en/user-guide/recording_changes.txt recording_changes.tx-20071121073725-0corxykv5irjal00-4
doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
doc/en/user-guide/reviewing_changes.txt reviewing_changes.tx-20071121073725-0corxykv5irjal00-6
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
doc/en/user-guide/solo_intro.txt solo_workflow.txt-20071121073725-0corxykv5irjal00-7
doc/en/user-guide/starting_a_project.txt starting_a_project.t-20071121073725-0corxykv5irjal00-8
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_checkouts.txt using_checkouts.txt-20071123055134-k5x4ekduci2lbn36-4
doc/en/user-guide/using_gatekeepers.txt using_gatekeepers.tx-20071123154453-dk2mjhrg1vpjm5w2-5
doc/en/user-guide/working_offline_central.txt working_offline_cent-20071123055134-k5x4ekduci2lbn36-5
doc/en/user-guide/writing_a_plugin.txt writing_a_plugin.txt-20071114035000-q36a9h57ps06uvnl-7
index.txt index.txt-20071121073725-0corxykv5irjal00-1
renamed:
doc/en/user-guide/centralized_workflow.txt => doc/en/tutorials/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/en/user-guide/tutorial.txt => doc/en/tutorials/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
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/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/branch_implementations/test_create_checkout.py test_create_checkout-20070322193723-n2wkp1g03r0404di-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_switch.py test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/en/user-guide/authentication_conf.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/en/user-guide/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
doc/en/tutorials/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
------------------------------------------------------------
revno: 3035.2.6
revision-id:john at arbash-meinel.com-20071130221329-thu3lcbolzqliilw
parent: john at arbash-meinel.com-20071130213846-qxvz8yuyfyiftil5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_check_parents_165290
timestamp: Fri 2007-11-30 16:13:29 -0600
message:
Suggested by Robert: Move the missing externals check into part of Packer.pack()
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
------------------------------------------------------------
revno: 3035.2.5
revision-id:john at arbash-meinel.com-20071130213846-qxvz8yuyfyiftil5
parent: john at arbash-meinel.com-20071130201158-s0ex85foh34nv429
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_check_parents_165290
timestamp: Fri 2007-11-30 15:38:46 -0600
message:
Rename function to remove _new_ (per Robert's suggestion)
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3035.2.4
revision-id:john at arbash-meinel.com-20071130201158-s0ex85foh34nv429
parent: john at arbash-meinel.com-20071130050802-aqswmc0a7sv7hal9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_check_parents_165290
timestamp: Fri 2007-11-30 14:11:58 -0600
message:
Fix bug #165290 by having the fetch code check that all external references are satisfied before it allows the data to be committed.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
------------------------------------------------------------
revno: 3035.2.3
revision-id:john at arbash-meinel.com-20071130050802-aqswmc0a7sv7hal9
parent: john at arbash-meinel.com-20071129224130-m720z00xtmovmj06
parent: robertc at robertcollins.net-20071129052352-pmhtuajnb1i7mpy4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_check_parents_165290
timestamp: Thu 2007-11-29 23:08:02 -0600
message:
merge Robert's reconcile work.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
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/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
------------------------------------------------------------
revno: 2951.1.10.1.10
revision-id:robertc at robertcollins.net-20071129052352-pmhtuajnb1i7mpy4
parent: robertc at robertcollins.net-20071129041406-4zzhzzpihmspiu9k
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile.packs
timestamp: Thu 2007-11-29 16:23:52 +1100
message:
Fix syntax error on last refactoring.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 2951.1.10.1.9
revision-id:robertc at robertcollins.net-20071129041406-4zzhzzpihmspiu9k
parent: robertc at robertcollins.net-20071129014512-qwfvultxzo9w6ot4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile.packs
timestamp: Thu 2007-11-29 15:14:06 +1100
message:
* ``pack-0.92`` repositories can now be reconciled.
(Robert Collins, #154173)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 2951.1.10.1.8
revision-id:robertc at robertcollins.net-20071129014512-qwfvultxzo9w6ot4
parent: robertc at robertcollins.net-20071128233626-7prd9kkgj1l0kmk1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile.packs
timestamp: Thu 2007-11-29 12:45:12 +1100
message:
Test that reconciling a repository can be done twice in a row.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
------------------------------------------------------------
revno: 2951.1.10.1.7
revision-id:robertc at robertcollins.net-20071128233626-7prd9kkgj1l0kmk1
parent: robertc at robertcollins.net-20071128233229-n0blldup87wo4vhq
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile.packs
timestamp: Thu 2007-11-29 10:36:26 +1100
message:
Raise an error on duplicate pack name allocation.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 2951.1.10.1.6
revision-id:robertc at robertcollins.net-20071128233229-n0blldup87wo4vhq
parent: robertc at robertcollins.net-20071114003450-4dm5g7tytjdjo9su
parent: pqm at pqm.ubuntu.com-20071128230840-b2ra2nso0qtqxon6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile.packs
timestamp: Thu 2007-11-29 10:32:29 +1100
message:
Merge bzr.dev.
added:
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/switch.py switch.py-20071116011000-v5lnw7d2wkng9eux-1
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
bzrlib/tests/repository_implementations/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
bzrlib/tests/repository_implementations/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/test_switch.py test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
renamed:
doc/developers/knitpack.txt => doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
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/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
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/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
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/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py test_get_revision_id-20070417211641-6kcoj1c704gqqopn-1
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
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/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_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
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_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
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_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/workingtree_implementations/test_break_lock.py test_break_lock.py-20060504115740-233e245df546fd42
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
------------------------------------------------------------
revno: 2951.1.10.1.5
revision-id:robertc at robertcollins.net-20071114003450-4dm5g7tytjdjo9su
parent: robertc at robertcollins.net-20071112205003-kkwjbx5xxj6tosmi
parent: pqm at pqm.ubuntu.com-20071114000124-2rkxwrcwid2wgcqn
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Wed 2007-11-14 11:34:50 +1100
message:
Merge bzr.dev.
added:
bzrlib/tests/tree_implementations/test_get_root_id.py test_get_root_id.py-20071026191509-a4conhr43f194avv-1
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/__init__.py __init__.py-20061101100249-8jwwl0d3jr080zim-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
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_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
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_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 2951.1.10.1.4
revision-id:robertc at robertcollins.net-20071112205003-kkwjbx5xxj6tosmi
parent: robertc at robertcollins.net-20071104225308-5hr23xw3jirl9mne
parent: pqm at pqm.ubuntu.com-20071112195430-0xgqswqpc1j2pk2m
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Tue 2007-11-13 07:50:03 +1100
message:
Merge bzr.dev.
added:
bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/lazy_import.py lazy_import.py-20060910203832-f77c54gf3n232za0-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/branch_implementations/test_create_checkout.py test_create_checkout-20070322193723-n2wkp1g03r0404di-1
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/knitpack.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
------------------------------------------------------------
revno: 2951.1.10.1.3
revision-id:robertc at robertcollins.net-20071104225308-5hr23xw3jirl9mne
parent: robertc at robertcollins.net-20071104204820-8a8tz6g8kiu1in4h
parent: pqm at pqm.ubuntu.com-20071104224734-8l8km2gqk9n1pdla
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Mon 2007-11-05 09:53:08 +1100
message:
Merge .dev.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 2951.1.10.1.2
revision-id:robertc at robertcollins.net-20071104204820-8a8tz6g8kiu1in4h
parent: robertc at robertcollins.net-20071104204151-amehfv5prpvhn92c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Mon 2007-11-05 07:48:20 +1100
message:
Factor out inventory text copying in Packer to a single helper method.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 2951.1.10.1.1
revision-id:robertc at robertcollins.net-20071104204151-amehfv5prpvhn92c
parent: robertc at robertcollins.net-20071104203532-6vndyb5pv82em6n7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Mon 2007-11-05 07:41:51 +1100
message:
Factor out revision text copying in Packer to a single helper method.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3035.2.2
revision-id:john at arbash-meinel.com-20071129224130-m720z00xtmovmj06
parent: john at arbash-meinel.com-20071129222729-cq78j0uzbqzvnm7z
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_check_parents_165290
timestamp: Thu 2007-11-29 16:41:30 -0600
message:
Add an interrepository test that when we are missing a basis text,
we either complain or fetch the missing text.
Currently fails for pack repositories.
modified:
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
------------------------------------------------------------
revno: 3035.2.1
revision-id:john at arbash-meinel.com-20071129222729-cq78j0uzbqzvnm7z
parent: pqm at pqm.ubuntu.com-20071127101459-zcdf4aia34927kt0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_check_parents_165290
timestamp: Thu 2007-11-29 16:27:29 -0600
message:
This was a redundant form
modified:
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
=== modified file 'NEWS'
--- a/NEWS 2007-11-30 22:30:38 +0000
+++ b/NEWS 2007-11-30 22:43:21 +0000
@@ -19,6 +19,9 @@
required.
(Vincent Ladeuil, #172701)
+ * Check for missing basis texts when fetching from packs to packs.
+ (John Arbash Meinel, #165290)
+
bzr 1.0rc1 2007-11-30
=====================
@@ -72,6 +75,9 @@
tree roots that's recorded for all other directories.
(Aaron Bentley, #164639)
+ * ``pack-0.92`` repositories can now be reconciled.
+ (Robert Collins, #154173)
+
* ``switch`` command added for changing the branch a lightweight checkout
is associated with and updating the tree to reflect the latest content
accordingly. This command was previously part of the BzrTools plug-in.
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py 2007-11-30 15:59:02 +0000
+++ b/bzrlib/repofmt/pack_repo.py 2007-12-01 00:10:53 +0000
@@ -173,6 +173,14 @@
"""The text index is the name + .tix."""
return self.index_name('text', name)
+ def _external_compression_parents_of_texts(self):
+ keys = set()
+ refs = set()
+ for node in self.text_index.iter_all_entries():
+ keys.add(node[1])
+ refs.update(node[3][1])
+ return refs - keys
+
class ExistingPack(Pack):
"""An in memory proxy for an existing .pack and its disk indices."""
@@ -373,6 +381,14 @@
self.pack_transport, self.name,
time.time() - self.start_time)
+ def flush(self):
+ """Flush any current data."""
+ if self._buffer[1]:
+ bytes = ''.join(self._buffer[0])
+ self.write_stream.write(bytes)
+ self._hash.update(bytes)
+ self._buffer[:] = [[], 0]
+
def index_name(self, index_type, name):
"""Get the disk name of an index type for pack name 'name'."""
return name + NewPack.index_definitions[index_type][0]
@@ -522,7 +538,19 @@
self.packs = packs
self.suffix = suffix
self.revision_ids = revision_ids
+ # The pack object we are creating.
+ self.new_pack = None
self._pack_collection = pack_collection
+ # The index layer keys for the revisions being copied. None for 'all
+ # objects'.
+ self._revision_keys = None
+ # What text keys to copy. None for 'all texts'. This is set by
+ # _copy_inventory_texts
+ self._text_filter = None
+ self._extra_init()
+
+ def _extra_init(self):
+ """A template hook to allow extending the constructor trivially."""
def pack(self, pb=None):
"""Create a new pack by reading data from other packs.
@@ -568,29 +596,13 @@
self._pack_collection._pack_transport, upload_suffix=self.suffix,
file_mode=self._pack_collection.repo.control_files._file_mode)
- def _create_pack_from_packs(self):
- self.pb.update("Opening pack", 0, 5)
- new_pack = self.open_pack()
- # buffer data - we won't be reading-back during the pack creation and
- # this makes a significant difference on sftp pushes.
- new_pack.set_write_cache_size(1024*1024)
- if 'pack' in debug.debug_flags:
- plain_pack_list = ['%s%s' % (a_pack.pack_transport.base, a_pack.name)
- for a_pack in self.packs]
- if self.revision_ids is not None:
- rev_count = len(self.revision_ids)
- else:
- rev_count = 'all'
- mutter('%s: create_pack: creating pack from source packs: '
- '%s%s %s revisions wanted %s t=0',
- time.ctime(), self._pack_collection._upload_transport.base, new_pack.random_name,
- plain_pack_list, rev_count)
+ def _copy_revision_texts(self):
+ """Copy revision data to the new pack."""
# select revisions
if self.revision_ids:
revision_keys = [(revision_id,) for revision_id in self.revision_ids]
else:
revision_keys = None
-
# select revision keys
revision_index_map = self._pack_collection._packs_list_to_pack_map_and_index_list(
self.packs, 'revision_index')[0]
@@ -598,14 +610,24 @@
# copy revision keys and adjust values
self.pb.update("Copying revision texts", 1)
list(self._copy_nodes_graph(revision_nodes, revision_index_map,
- new_pack._writer, new_pack.revision_index))
+ self.new_pack._writer, self.new_pack.revision_index))
if 'pack' in debug.debug_flags:
mutter('%s: create_pack: revisions copied: %s%s %d items t+%6.3fs',
- time.ctime(), self._pack_collection._upload_transport.base, new_pack.random_name,
- new_pack.revision_index.key_count(),
- time.time() - new_pack.start_time)
+ time.ctime(), self._pack_collection._upload_transport.base,
+ self.new_pack.random_name,
+ self.new_pack.revision_index.key_count(),
+ time.time() - self.new_pack.start_time)
+ self._revision_keys = revision_keys
+
+ def _copy_inventory_texts(self):
+ """Copy the inventory texts to the new pack.
+
+ self._revision_keys is used to determine what inventories to copy.
+
+ Sets self._text_filter appropriately.
+ """
# select inventory keys
- inv_keys = revision_keys # currently the same keyspace, and note that
+ inv_keys = self._revision_keys # currently the same keyspace, and note that
# querying for keys here could introduce a bug where an inventory item
# is missed, so do not change it to query separately without cross
# checking like the text key check below.
@@ -617,28 +639,24 @@
# at this point.
self.pb.update("Copying inventory texts", 2)
inv_lines = self._copy_nodes_graph(inv_nodes, inventory_index_map,
- new_pack._writer, new_pack.inventory_index, output_lines=True)
+ self.new_pack._writer, self.new_pack.inventory_index, output_lines=True)
if self.revision_ids:
- fileid_revisions = self._pack_collection.repo._find_file_ids_from_xml_inventory_lines(
- inv_lines, self.revision_ids)
- text_filter = []
- for fileid, file_revids in fileid_revisions.iteritems():
- text_filter.extend(
- [(fileid, file_revid) for file_revid in file_revids])
+ self._process_inventory_lines(inv_lines)
else:
# eat the iterator to cause it to execute.
list(inv_lines)
- text_filter = None
+ self._text_filter = None
if 'pack' in debug.debug_flags:
mutter('%s: create_pack: inventories copied: %s%s %d items t+%6.3fs',
- time.ctime(), self._pack_collection._upload_transport.base, new_pack.random_name,
- new_pack.inventory_index.key_count(),
+ time.ctime(), self._pack_collection._upload_transport.base,
+ self.new_pack.random_name,
+ self.new_pack.inventory_index.key_count(),
time.time() - new_pack.start_time)
+
+ def _copy_text_texts(self):
# select text keys
- text_index_map = self._pack_collection._packs_list_to_pack_map_and_index_list(
- self.packs, 'text_index')[0]
- text_nodes = self._pack_collection._index_contents(text_index_map, text_filter)
- if text_filter is not None:
+ text_index_map, text_nodes = self._get_text_nodes()
+ if self._text_filter is not None:
# We could return the keys copied as part of the return value from
# _copy_nodes_graph but this doesn't work all that well with the
# need to get line output too, so we check separately, and as we're
@@ -647,7 +665,7 @@
# mising records.
text_nodes = set(text_nodes)
present_text_keys = set(_node[1] for _node in text_nodes)
- missing_text_keys = set(text_filter) - present_text_keys
+ missing_text_keys = set(self._text_filter) - present_text_keys
if missing_text_keys:
# TODO: raise a specific error that can handle many missing
# keys.
@@ -657,14 +675,45 @@
# copy text keys and adjust values
self.pb.update("Copying content texts", 3)
list(self._copy_nodes_graph(text_nodes, text_index_map,
- new_pack._writer, new_pack.text_index))
+ self.new_pack._writer, self.new_pack.text_index))
+ self._log_copied_texts()
+
+ def _check_references(self):
+ """Make sure our external refereneces are present."""
+ external_refs = self.new_pack._external_compression_parents_of_texts()
+ if external_refs:
+ index = self._pack_collection.text_index.combined_index
+ found_items = list(index.iter_entries(external_refs))
+ if len(found_items) != len(external_refs):
+ found_keys = set(k for idx, k, refs, value in found_items)
+ missing_items = external_refs - found_keys
+ missing_file_id, missing_revision_id = missing_items.pop()
+ raise errors.RevisionNotPresent(missing_revision_id,
+ missing_file_id)
+
+ def _create_pack_from_packs(self):
+ self.pb.update("Opening pack", 0, 5)
+ self.new_pack = self.open_pack()
+ new_pack = self.new_pack
+ # buffer data - we won't be reading-back during the pack creation and
+ # this makes a significant difference on sftp pushes.
+ new_pack.set_write_cache_size(1024*1024)
if 'pack' in debug.debug_flags:
- mutter('%s: create_pack: file texts copied: %s%s %d items t+%6.3fs',
+ plain_pack_list = ['%s%s' % (a_pack.pack_transport.base, a_pack.name)
+ for a_pack in self.packs]
+ if self.revision_ids is not None:
+ rev_count = len(self.revision_ids)
+ else:
+ rev_count = 'all'
+ mutter('%s: create_pack: creating pack from source packs: '
+ '%s%s %s revisions wanted %s t=0',
time.ctime(), self._pack_collection._upload_transport.base, new_pack.random_name,
- new_pack.text_index.key_count(),
- time.time() - new_pack.start_time)
+ plain_pack_list, rev_count)
+ self._copy_revision_texts()
+ self._copy_inventory_texts()
+ self._copy_text_texts()
# select signature keys
- signature_filter = revision_keys # same keyspace
+ signature_filter = self._revision_keys # same keyspace
signature_index_map = self._pack_collection._packs_list_to_pack_map_and_index_list(
self.packs, 'signature_index')[0]
signature_nodes = self._pack_collection._index_contents(signature_index_map,
@@ -678,7 +727,8 @@
time.ctime(), self._pack_collection._upload_transport.base, new_pack.random_name,
new_pack.signature_index.key_count(),
time.time() - new_pack.start_time)
- if not new_pack.data_inserted():
+ self._check_references()
+ if not self._use_pack(new_pack):
new_pack.abort()
return None
self.pb.update("Finishing pack", 5)
@@ -811,6 +861,38 @@
pb.update("Copied record", record_index)
record_index += 1
+ def _get_text_nodes(self):
+ text_index_map = self._pack_collection._packs_list_to_pack_map_and_index_list(
+ self.packs, 'text_index')[0]
+ return text_index_map, self._pack_collection._index_contents(text_index_map,
+ self._text_filter)
+
+ def _log_copied_texts(self):
+ if 'pack' in debug.debug_flags:
+ mutter('%s: create_pack: file texts copied: %s%s %d items t+%6.3fs',
+ time.ctime(), self._pack_collection._upload_transport.base,
+ self.new_pack.random_name,
+ self.new_pack.text_index.key_count(),
+ time.time() - self.new_pack.start_time)
+
+ def _process_inventory_lines(self, inv_lines):
+ """Use up the inv_lines generator and setup a text key filter."""
+ repo = self._pack_collection.repo
+ fileid_revisions = repo._find_file_ids_from_xml_inventory_lines(
+ inv_lines, self.revision_ids)
+ text_filter = []
+ for fileid, file_revids in fileid_revisions.iteritems():
+ text_filter.extend([(fileid, file_revid) for file_revid in file_revids])
+ self._text_filter = text_filter
+
+ def _use_pack(self, new_pack):
+ """Return True if new_pack should be used.
+
+ :param new_pack: The pack that has just been created.
+ :return: True if the pack should be used.
+ """
+ return new_pack.data_inserted()
+
class ReconcilePacker(Packer):
"""A packer which regenerates indices etc as it copies.
@@ -819,6 +901,132 @@
regenerated.
"""
+ def _extra_init(self):
+ self._data_changed = False
+
+ def _process_inventory_lines(self, inv_lines):
+ """Generate a text key reference map rather for reconciling with."""
+ repo = self._pack_collection.repo
+ refs = repo._find_text_key_references_from_xml_inventory_lines(
+ inv_lines)
+ self._text_refs = refs
+ # during reconcile we:
+ # - convert unreferenced texts to full texts
+ # - correct texts which reference a text not copied to be full texts
+ # - copy all others as-is but with corrected parents.
+ # - so at this point we don't know enough to decide what becomes a full
+ # text.
+ self._text_filter = None
+
+ def _copy_text_texts(self):
+ """generate what texts we should have and then copy."""
+ self.pb.update("Copying content texts", 3)
+ # we have three major tasks here:
+ # 1) generate the ideal index
+ repo = self._pack_collection.repo
+ ideal_index = repo._generate_text_key_index(self._text_refs)
+ # 2) generate a text_nodes list that contains all the deltas that can
+ # be used as-is, with corrected parents.
+ ok_nodes = []
+ bad_texts = []
+ discarded_nodes = []
+ NULL_REVISION = _mod_revision.NULL_REVISION
+ text_index_map, text_nodes = self._get_text_nodes()
+ for node in text_nodes:
+ # 0 - index
+ # 1 - key
+ # 2 - value
+ # 3 - refs
+ try:
+ ideal_parents = tuple(ideal_index[node[1]])
+ except KeyError:
+ discarded_nodes.append(node)
+ self._data_changed = True
+ else:
+ if ideal_parents == (NULL_REVISION,):
+ ideal_parents = ()
+ if ideal_parents == node[3][0]:
+ # no change needed.
+ ok_nodes.append(node)
+ elif ideal_parents[0:1] == node[3][0][0:1]:
+ # the left most parent is the same, or there are no parents
+ # today. Either way, we can preserve the representation as
+ # long as we change the refs to be inserted.
+ self._data_changed = True
+ ok_nodes.append((node[0], node[1], node[2],
+ (ideal_parents, node[3][1])))
+ self._data_changed = True
+ else:
+ # Reinsert this text completely
+ bad_texts.append((node[1], ideal_parents))
+ self._data_changed = True
+ # we're finished with some data.
+ del ideal_index
+ del text_nodes
+ # 3) bulk copy the ok data
+ list(self._copy_nodes_graph(ok_nodes, text_index_map,
+ self.new_pack._writer, self.new_pack.text_index))
+ # 3) adhoc copy all the other texts.
+ transaction = repo.get_transaction()
+ file_id_index = GraphIndexPrefixAdapter(
+ self.new_pack.text_index,
+ ('blank', ), 1,
+ add_nodes_callback=self.new_pack.text_index.add_nodes)
+ knit_index = KnitGraphIndex(file_id_index,
+ add_callback=file_id_index.add_nodes,
+ deltas=True, parents=True)
+ output_knit = knit.KnitVersionedFile('reconcile-texts',
+ self._pack_collection.transport,
+ None,
+ index=knit_index,
+ access_method=_PackAccess(
+ {self.new_pack.text_index:self.new_pack.access_tuple()},
+ (self.new_pack._writer, self.new_pack.text_index)),
+ factory=knit.KnitPlainFactory())
+ for key, parent_keys in bad_texts:
+ # We refer to the new pack to delta data being output.
+ # A possible improvement would be to catch errors on short reads
+ # and only flush then.
+ self.new_pack.flush()
+ parents = []
+ for parent_key in parent_keys:
+ if parent_key[0] != key[0]:
+ # Graph parents must match the fileid
+ raise errors.BzrError('Mismatched key parent %r:%r' %
+ (key, parent_keys))
+ parents.append(parent_key[1])
+ source_weave = repo.weave_store.get_weave(key[0], transaction)
+ text_lines = source_weave.get_lines(key[1])
+ # adapt the 'knit' to the current file_id.
+ file_id_index = GraphIndexPrefixAdapter(
+ self.new_pack.text_index,
+ (key[0], ), 1,
+ add_nodes_callback=self.new_pack.text_index.add_nodes)
+ knit_index._graph_index = file_id_index
+ knit_index._add_callback = file_id_index.add_nodes
+ output_knit.add_lines_with_ghosts(
+ key[1], parents, text_lines, random_id=True, check_content=False)
+ # 4) check that nothing inserted has a reference outside the keyspace.
+ missing_text_keys = self.new_pack._external_compression_parents_of_texts()
+ if missing_text_keys:
+ raise errors.BzrError('Reference to missing compression parents %r'
+ % (refs - keys,))
+ self._log_copied_texts()
+
+ def _use_pack(self, new_pack):
+ """Override _use_pack to check for reconcile having changed content."""
+ # XXX: we might be better checking this at the copy time.
+ original_inventory_keys = set()
+ inv_index = self._pack_collection.inventory_index.combined_index
+ for entry in inv_index.iter_all_entries():
+ original_inventory_keys.add(entry[1])
+ new_inventory_keys = set()
+ for entry in new_pack.inventory_index.iter_all_entries():
+ new_inventory_keys.add(entry[1])
+ if new_inventory_keys != original_inventory_keys:
+ self._data_changed = True
+ return new_pack.data_inserted() and self._data_changed
+
class RepositoryPackCollection(object):
"""Management of packs within a repository."""
@@ -1075,10 +1283,8 @@
"""
self.ensure_loaded()
if a_new_pack.name in self._names:
- # a collision with the packs we know about (not the only possible
- # collision, see NewPack.finish() for some discussion). Remove our
- # prior reference to it.
- self._remove_pack_from_memory(a_new_pack)
+ raise errors.BzrError(
+ 'Pack %r already exists in %s' % (a_new_pack.name, self))
self._names[a_new_pack.name] = tuple(a_new_pack.index_sizes)
self.add_pack_to_memory(a_new_pack)
@@ -1549,7 +1755,7 @@
self._transaction = None
# for tests
self._reconcile_does_inventory_gc = True
- self._reconcile_fixes_text_parents = False
+ self._reconcile_fixes_text_parents = True
self._reconcile_backsup_inventory = False
def _abort_write_group(self):
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2007-11-29 07:52:41 +0000
+++ b/bzrlib/repository.py 2007-11-30 22:40:29 +0000
@@ -1242,7 +1242,7 @@
raise errors.NoSuchIdInRepository(self, file_id)
yield callable_data, weave.get_lines(revision_id)
- def _generate_text_key_index(self):
+ def _generate_text_key_index(self, text_key_references=None):
"""Generate a new text key index for the repository.
This is an expensive function that will take considerable time to run.
@@ -1254,7 +1254,8 @@
# All revisions, to find inventory parents.
revision_graph = self.get_revision_graph_with_ghosts()
ancestors = revision_graph.get_ancestors()
- text_key_references = self.find_text_key_references()
+ if text_key_references is None:
+ text_key_references = self.find_text_key_references()
pb = ui.ui_factory.nested_progress_bar()
try:
return self._do_generate_text_key_index(ancestors,
=== modified file 'bzrlib/tests/interrepository_implementations/__init__.py'
--- a/bzrlib/tests/interrepository_implementations/__init__.py 2007-11-17 00:14:55 +0000
+++ b/bzrlib/tests/interrepository_implementations/__init__.py 2007-11-29 22:27:29 +0000
@@ -103,9 +103,6 @@
knitrepo.RepositoryFormatKnit3()))
result.append((InterKnitRepo,
knitrepo.RepositoryFormatKnit1(),
- knitrepo.RepositoryFormatKnit1()))
- result.append((InterKnitRepo,
- knitrepo.RepositoryFormatKnit1(),
pack_repo.RepositoryFormatKnitPack1()))
result.append((InterKnitRepo,
pack_repo.RepositoryFormatKnitPack1(),
=== modified file 'bzrlib/tests/interrepository_implementations/test_interrepository.py'
--- a/bzrlib/tests/interrepository_implementations/test_interrepository.py 2007-11-26 20:18:50 +0000
+++ b/bzrlib/tests/interrepository_implementations/test_interrepository.py 2007-11-30 22:13:29 +0000
@@ -158,7 +158,50 @@
# makes a target version repo
repo_b = self.make_to_repository('b')
check_push_rev1(repo_b)
-
+
+ def test_fetch_missing_basis_text(self):
+ """If fetching a delta, we should die if a basis is not present."""
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/a'])
+ tree.add(['a'], ['a-id'])
+ tree.commit('one', rev_id='rev-one')
+ self.build_tree_contents([('tree/a', 'new contents\n')])
+ tree.commit('two', rev_id='rev-two')
+
+ to_repo = self.make_to_repository('to_repo')
+ # We build a broken revision so that we can test the fetch code dies
+ # properly. So copy the inventory and revision, but not the text.
+ to_repo.lock_write()
+ try:
+ to_repo.start_write_group()
+ inv = tree.branch.repository.get_inventory('rev-one')
+ to_repo.add_inventory('rev-one', inv, [])
+ rev = tree.branch.repository.get_revision('rev-one')
+ to_repo.add_revision('rev-one', rev, inv=inv)
+ to_repo.commit_write_group()
+ finally:
+ to_repo.unlock()
+
+ # Implementations can either copy the missing basis text, or raise an
+ # exception
+ try:
+ to_repo.fetch(tree.branch.repository, 'rev-two')
+ except errors.RevisionNotPresent, e:
+ # If an exception is raised, the revision should not be in the
+ # target.
+ self.assertRaises((errors.NoSuchRevision, errors.RevisionNotPresent),
+ to_repo.revision_tree, 'rev-two')
+ else:
+ # If not exception is raised, then the basis text should be
+ # available.
+ to_repo.lock_read()
+ try:
+ rt = to_repo.revision_tree('rev-one')
+ self.assertEqual('contents of tree/a\n',
+ rt.get_file_text('a-id'))
+ finally:
+ to_repo.unlock()
+
def test_fetch_missing_revision_same_location_fails(self):
repo_a = self.make_repository('.')
repo_b = repository.Repository.open('.')
=== modified file 'bzrlib/tests/repository_implementations/test_reconcile.py'
--- a/bzrlib/tests/repository_implementations/test_reconcile.py 2007-11-03 14:26:37 +0000
+++ b/bzrlib/tests/repository_implementations/test_reconcile.py 2007-11-29 01:45:12 +0000
@@ -390,3 +390,11 @@
self.assertFalse(reconciler.aborted,
"reconcile should not have aborted on an unbroken repository.")
+
+class TestRepeatedReconcile(TestReconcile):
+
+ def test_trivial_two_reconciles_no_error(self):
+ tree = self.make_branch_and_tree('.')
+ tree.commit('first post')
+ tree.branch.repository.reconcile(thorough=True)
+ tree.branch.repository.reconcile(thorough=True)
More information about the bazaar-commits
mailing list