Rev 1461: Merge in bzr-dir phase 3,
enabling controlled upgrades and shared repositories. in
/home/robertc/source/baz/integration/
Robert Collins
robertc at robertcollins.net
Sat Feb 18 00:57:25 GMT 2006
------------------------------------------------------------
revno: 1461
revision-id: robertc at robertcollins.net-20060218005717-348c76bf711254a5
parent: robertc at robertcollins.net-20060217044707-8c15dab107f79a40
parent: robertc at robertcollins.net-20060217041709-7251eb701f69ca7e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-02-18 11:57:17 +1100
message:
Merge in bzr-dir phase 3, enabling controlled upgrades and shared repositories.
added:
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/workingtree_implementations/test_is_control_filename.py test_is_control_filename.py-20060216024958-f5afdebb2fa36418
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: robertc at robertcollins.net-20060217041709-7251eb701f69ca7e
parent: robertc at robertcollins.net-20060216212934-c10d24ea7748de86
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Fri 2006-02-17 15:17:09 +1100
message:
Review feedback.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216212934-c10d24ea7748de86
parent: robertc at robertcollins.net-20060216112639-6a6a78dbb33a4cc8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Fri 2006-02-17 08:29:34 +1100
message:
Review fixups
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216112639-6a6a78dbb33a4cc8
parent: robertc at robertcollins.net-20060216111947-e6946ac37fe8b21a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 22:26:39 +1100
message:
Bugfix upgrades to metadir to set the last-revision correctly.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216111947-e6946ac37fe8b21a
parent: robertc at robertcollins.net-20060216093327-7c4374cea3c33734
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 22:19:47 +1100
message:
Correct buggy test.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216093327-7c4374cea3c33734
parent: robertc at robertcollins.net-20060216093135-c9345853176d94b2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 20:33:27 +1100
message:
Remove ancestry.weave removal todo.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216093135-c9345853176d94b2
parent: robertc at robertcollins.net-20060216085152-d0311d8efd0c654c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 20:31:35 +1100
message:
Implement upgrades to Metaformat trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216085152-d0311d8efd0c654c
parent: robertc at robertcollins.net-20060216081832-4ef742424a888da0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 19:51:52 +1100
message:
Make upgrade driver unaware of the specific formats in play.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216081832-4ef742424a888da0
parent: robertc at robertcollins.net-20060216072216-1cd8117a8e2a24bf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 19:18:32 +1100
message:
Advise users running upgrade on a checkout to also run it on the branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216072216-1cd8117a8e2a24bf
parent: robertc at robertcollins.net-20060216072025-8a97e0b2c3f3cc92
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 18:22:16 +1100
message:
Ensure that bzrdir implementations offer the can_update_format and needs_format_update api.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216072025-8a97e0b2c3f3cc92
parent: robertc at robertcollins.net-20060216055402-bb6afc4d15c715cd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 18:20:25 +1100
message:
Start factoring out the upgrade policy logic.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216055402-bb6afc4d15c715cd
parent: robertc at robertcollins.net-20060216025300-dfb5d2536908f060
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 16:54:02 +1100
message:
split out converter logic into per-format objects.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216025300-dfb5d2536908f060
parent: robertc at robertcollins.net-20060216004439-5110484bd7b39a88
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 13:53:00 +1100
message:
Move is_control_file into WorkingTree.is_control_filename and test.
Remove the bzrlib.BZRDIR constant as no longer needed. Deliberately
not deprecating is as it should not ever have been public.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060216004439-5110484bd7b39a88
parent: robertc at robertcollins.net-20060215081137-4c27377517e96dd1
parent: robertc at robertcollins.net-20060215221605-09ef2fed453334c6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-16 11:44:39 +1100
message:
merge repository.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060215221605-09ef2fed453334c6
parent: robertc at robertcollins.net-20060215203303-b089365be1ea915e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Thu 2006-02-16 09:16:05 +1100
message:
Typo found by John Meinel.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060215203303-b089365be1ea915e
parent: robertc at robertcollins.net-20060215035815-93475eacfb0b41d2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Thu 2006-02-16 07:33:03 +1100
message:
Review feedback.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060215035815-93475eacfb0b41d2
parent: robertc at robertcollins.net-20060214112307-824f0b126b3c70a9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Wed 2006-02-15 14:58:15 +1100
message:
Finish use of repositories support.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060214112307-824f0b126b3c70a9
parent: robertc at robertcollins.net-20060214082509-40b79032956d7ae1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Tue 2006-02-14 22:23:07 +1100
message:
sprouting into shared repositories
------------------------------------------------------------
merged: robertc at robertcollins.net-20060214082509-40b79032956d7ae1
parent: robertc at robertcollins.net-20060214081409-f4f364f43abf04da
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Tue 2006-02-14 19:25:09 +1100
message:
Test the use of clone on empty bzrdir with force_new_repo.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060214081409-f4f364f43abf04da
parent: robertc at robertcollins.net-20060214040706-ab43d8450989c555
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Tue 2006-02-14 19:14:09 +1100
message:
Merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060214040706-ab43d8450989c555
parent: robertc at robertcollins.net-20060213105450-ecb3a07f7774a697
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Tue 2006-02-14 15:07:06 +1100
message:
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213105450-ecb3a07f7774a697
parent: robertc at robertcollins.net-20060213084957-29f8ae569f789cef
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2006-02-13 21:54:50 +1100
message:
Cloning of repos preserves shared and make-working-tree attributes.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213084957-29f8ae569f789cef
parent: robertc at robertcollins.net-20060213081516-3d13375f0de0ccb6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2006-02-13 19:49:57 +1100
message:
Creating or opening a branch will use the repository if the format supports that.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213081516-3d13375f0de0ccb6
parent: robertc at robertcollins.net-20060213071300-a816a826be25821b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2006-02-13 19:15:16 +1100
message:
find_repository sufficiently robust.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213071300-a816a826be25821b
parent: robertc at robertcollins.net-20060213064504-0bb16aece9d8abd9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2006-02-13 18:13:00 +1100
message:
find_repository limit cases.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213064504-0bb16aece9d8abd9
parent: robertc at robertcollins.net-20060212205854-5bd98a23ff8314f4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2006-02-13 17:45:04 +1100
message:
allow API creation of shared repositories
------------------------------------------------------------
merged: robertc at robertcollins.net-20060215081137-4c27377517e96dd1
parent: robertc at robertcollins.net-20060215070853-c7b2e20915f6be58
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Wed 2006-02-15 19:11:37 +1100
message:
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060215070853-c7b2e20915f6be58
parent: robertc at robertcollins.net-20060215060808-d47d40998fea0aee
parent: robertc at robertcollins.net-20060215035815-93475eacfb0b41d2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Wed 2006-02-15 18:08:53 +1100
message:
Merge repository so I dont trample on myself.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060215060808-d47d40998fea0aee
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Wed 2006-02-15 17:08:08 +1100
message:
Give info some reasonable output and tests.
More information about the bazaar-commits
mailing list