Rev 1528: [merge] land Robert's branch-formats branch in
/home/mbp/work/bzr.dev
Martin Pool
mbp at sourcefrog.net
Wed Feb 1 13:08:16 GMT 2006
------------------------------------------------------------
revno: 1528
revision-id: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
parent: mbp at sourcefrog.net-20060201063713-4cb4d1afcaeba538
parent: mbp at sourcefrog.net-20060201124612-9d8bc9fecf4ca61f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-02-02 00:08:13 +1100
message:
[merge] land Robert's branch-formats branch
removed:
bzrlib/tests/test_remove.py test_remove.py-20051212071329-1925f463b565a5c3
added:
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/ branch_implementations-20060123013029-45ffae35c99eae60
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/transport/readonly.py readonly.py-20060120032407-66d3166c39ffdc79
renamed:
bzrlib/tests/test_branch.py => bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_status.py => bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/merge.py* merge.py-20050513021216-953b65a438527106
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/tests/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_revprops.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
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_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http.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/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060201124612-9d8bc9fecf4ca61f
parent: mbp at sourcefrog.net-20060201122435-53f3efb1b5749fe1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.merge.branch-formats
timestamp: Wed 2006-02-01 23:46:12 +1100
message:
Deprecation warnings for popular APIs that will change in BzrDir
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060201122435-53f3efb1b5749fe1
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
parent: robertc at robertcollins.net-20060126223910-4500ee14cdc22d64
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.merge.branch-formats
timestamp: Wed 2006-02-01 23:24:35 +1100
message:
[merge] branch-formats branch, and reconcile changes
------------------------------------------------------------
merged: robertc at robertcollins.net-20060126223910-4500ee14cdc22d64
parent: robertc at robertcollins.net-20060126223047-f8e3740a44339978
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 09:39:10 +1100
message:
Rename deprecated_nonce to DEPRECATED_PARAMETER
------------------------------------------------------------
merged: robertc at robertcollins.net-20060126223047-f8e3740a44339978
parent: robertc at robertcollins.net-20060126221504-254f5ccbbcb16c15
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 09:30:47 +1100
message:
cleanedup test_outside_wt
------------------------------------------------------------
merged: robertc at robertcollins.net-20060126221504-254f5ccbbcb16c15
parent: robertc at robertcollins.net-20060126214406-6727c356b2ba10a0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 09:15:04 +1100
message:
Test signature preservation on clone and upgrade.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060126214406-6727c356b2ba10a0
parent: robertc at robertcollins.net-20060126205258-fcf323f36c57112b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 08:44:06 +1100
message:
Revision signature storing is on repository now.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060126205258-fcf323f36c57112b
parent: robertc at robertcollins.net-20060125060036-6bbfdc10d87b35e5
parent: robertc at robertcollins.net-20060125055408-decd09a9f3f91658
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 07:52:58 +1100
message:
first cut at merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060125060036-6bbfdc10d87b35e5
parent: robertc at robertcollins.net-20060124044433-d0103f34848a9558
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Wed 2006-01-25 17:00:36 +1100
message:
update TODO
------------------------------------------------------------
merged: robertc at robertcollins.net-20060124044433-d0103f34848a9558
parent: robertc at robertcollins.net-20060123034325-508ad07a2559d115
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Tue 2006-01-24 15:44:33 +1100
message:
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060123034325-508ad07a2559d115
parent: robertc at robertcollins.net-20060123014232-caba4df1b7e1259e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-23 14:43:25 +1100
message:
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060123014232-caba4df1b7e1259e
parent: robertc at robertcollins.net-20060123014028-89452b2ed32e4651
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-23 12:42:32 +1100
message:
update (C) on branch_implementations/__init__.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20060123014028-89452b2ed32e4651
parent: robertc at robertcollins.net-20060122224902-2c68cdc75bceb408
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-23 12:40:28 +1100
message:
Move branch implementations tests into a package.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060122224902-2c68cdc75bceb408
parent: robertc at robertcollins.net-20060122114307-487fe8584d86d597
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-23 09:49:02 +1100
message:
update TODOs and move abstract methods that were misplaced on BzrBranchFormat5 to Branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060122114307-487fe8584d86d597
parent: robertc at robertcollins.net-20060121113408-0429a0817c693c37
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Sun 2006-01-22 22:43:07 +1100
message:
Extend the copy_to tests to smoke test server-to-same-server copies to catch optimised code paths, and fix sftps optimised code path by removing dead code.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060121113408-0429a0817c693c37
parent: robertc at robertcollins.net-20060121113015-c631e38e958d0dee
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Sat 2006-01-21 22:34:08 +1100
message:
Add TODO.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060121113015-c631e38e958d0dee
parent: robertc at robertcollins.net-20060121110429-8883570a51449565
parent: robertc at robertcollins.net-20060121104713-1ccd09539b35a07b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Sat 2006-01-21 22:30:15 +1100
message:
merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060121110429-8883570a51449565
parent: robertc at robertcollins.net-20060120234452-3df6c9440800110b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Sat 2006-01-21 22:04:29 +1100
message:
update TODO.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120234452-3df6c9440800110b
parent: robertc at robertcollins.net-20060120224536-44e2f4c17879f9a0
parent: robertc at robertcollins.net-20060118011340-ab7ab3d0ecc47c0f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Sat 2006-01-21 10:44:52 +1100
message:
merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120224536-44e2f4c17879f9a0
parent: robertc at robertcollins.net-20060120090619-c6e6e34e54fd99fe
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Sat 2006-01-21 09:45:36 +1100
message:
Last vestiges of local file requirements for upgrade nuked
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120090619-c6e6e34e54fd99fe
parent: robertc at robertcollins.net-20060120070028-5ffb6a61e660c09b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 20:06:19 +1100
message:
Remove shutil dependency in upgrade - create a delete_tree method for transports.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120070028-5ffb6a61e660c09b
parent: robertc at robertcollins.net-20060120062320-cb96c6d5fecadcd2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 18:00:28 +1100
message:
Replace copy_tree with transport logic in upgreade.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120062320-cb96c6d5fecadcd2
parent: robertc at robertcollins.net-20060120055716-00ab1d29129a68ff
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 17:23:20 +1100
message:
Give a reasonable warning on attempts to upgrade a readonly url.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120055716-00ab1d29129a68ff
parent: robertc at robertcollins.net-20060120054715-f5ea35d42b9c3938
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 16:57:16 +1100
message:
Tweak formats implementation test to exercise readonly and readwrite transports.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120054715-f5ea35d42b9c3938
parent: robertc at robertcollins.net-20060120050441-818215bbba269589
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 16:47:15 +1100
message:
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120050441-818215bbba269589
parent: robertc at robertcollins.net-20060120032422-62237a61b04453cd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 16:04:41 +1100
message:
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120032422-62237a61b04453cd
parent: robertc at robertcollins.net-20060120011003-ff01286aee2d07c2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 14:24:22 +1100
message:
Add a readonly decorator for transports.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120011003-ff01286aee2d07c2
parent: robertc at robertcollins.net-20060120001804-4f4fce08348cae54
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 12:10:03 +1100
message:
Unfuck upgrade.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120001804-4f4fce08348cae54
parent: robertc at robertcollins.net-20060118052109-f93523ebe8868ce6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 11:18:04 +1100
message:
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060118052109-f93523ebe8868ce6
parent: robertc at robertcollins.net-20060116231610-79021f5b63d883f6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Wed 2006-01-18 16:21:09 +1100
message:
Remove last uses of the init= parameter to BzrBranch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060116231610-79021f5b63d883f6
parent: robertc at robertcollins.net-20060116073453-80b3e1ef7706d097
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Tue 2006-01-17 10:16:10 +1100
message:
Turn branch format.open into a factory.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060116073453-80b3e1ef7706d097
parent: robertc at robertcollins.net-20060116065615-01948b690e9f8842
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-16 18:34:53 +1100
message:
Make BzrBranchFormat.find_format take a transport not a url for efficiency.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060116065615-01948b690e9f8842
parent: robertc at robertcollins.net-20060115205932-8dd2cea5129cae8a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-16 17:56:15 +1100
message:
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060115205932-8dd2cea5129cae8a
parent: robertc at robertcollins.net-20060112052540-2fe6e566d6ebf605
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-16 07:59:32 +1100
message:
Introduce BranchFormats - factoring out intialisation of Branches.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060112052540-2fe6e566d6ebf605
parent: robertc at robertcollins.net-20060112024225-fe991391e088dd58
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Thu 2006-01-12 16:25:40 +1100
message:
Allow parameterisation of the branch initialisation for bzrlib.
More information about the bazaar-commits
mailing list