Rev 1414: Merge in bzr.dev. in /home/robertc/source/baz/launchpad/
Robert Collins
robertc at robertcollins.net
Fri Feb 24 20:43:20 GMT 2006
------------------------------------------------------------
revno: 1414
revision-id: robertc at robertcollins.net-20060224204305-528289ac91698efe
parent: robertc at robertcollins.net-20060118011702-8a97125655fc306a
parent: robertc at robertcollins.net-20060222233130-dfffba0d31e6a77a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: launchpad
timestamp: Sat 2006-02-25 07:43:05 +1100
message:
Merge in bzr.dev.
removed:
bzrlib/changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/clone.py clone.py-20050929121333-bc726d1ddd8042bc
bzrlib/merge_core.py merge_core.py-20050513021216-eda88728698d4401
bzrlib/tests/test_remove.py test_remove.py-20051212071329-1925f463b565a5c3
patches/ patches-20050517065551-d76e971b4c04e6e3
added:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/decorators.py decorators.py-20060112082512-6bfc2d882df1698d
bzrlib/doc/ doc-20051224020731-4d79ab81ba9b0ca7
bzrlib/doc/__init__.py __init__.py-20051224020731-eb3eb3ef5b4570df
bzrlib/doc/api/ api-20051224020744-3aff371bd0c8d249
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/doc/api/branch.txt branch.txt-20060130010728-d96c35d50b205aed
bzrlib/doc/api/transport.txt transport.txt-20051224020744-66b4fb564d98a5a5
bzrlib/iterablefile.py iterablefile.py-20051225230610-c93e5550a82115ed
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
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_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
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/ branch_implementations-20060123013029-45ffae35c99eae60
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/bzrdir_implementations/ bzrdir_implementations-20060131065642-5f93a74343e7c596
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/ interrepository_implementations-20060220054716-8b62476625d70af3
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/ repository_implementations-20060131092037-ec97814745cc6128
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
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_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
bzrlib/tests/test_doc_generate.py test_doc_generate.py-20051224124638-88da58fc872b93ba
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/workingtree_implementations/ workingtree_implementations-20060203003124-eada934f41adc89b
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_is_control_filename.py test_is_control_filename.py-20060216024958-f5afdebb2fa36418
bzrlib/tests/workingtree_implementations/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/readonly.py readonly.py-20060120032407-66d3166c39ffdc79
generate_docs.py bzrinfogen.py-20051211224525-78e7c14f2c955e55
tools/__init__.py __init__.py-20051212012857-39c9a39aa197f064
tools/doc_generate/ bzrinfogen-20051211214907-45ff5f0af3a80b32
tools/doc_generate/__init__.py __init__.py-20051211214907-df9e0e6b493553f1
tools/doc_generate/autodoc_bash_completion.py big_bash_completion.py-20051211223059-00ecfbfcc8056b78
renamed:
bzr_man.py => tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
bzrlib/tests/test_branch.py => bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_parent.py => bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/test_status.py => bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/xml.py => bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
TODO TODO-20050426050852-44d2ad9048dafbe9
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
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/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py* merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patch.py patch.py-20050513021216-ad183543f56ee2e5
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/text.py text.py-20050928201105-c26468dcb5d9b18b
bzrlib/store/weave.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
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/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
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_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
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_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
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_rio.py test_rio.py-20051128032247-dcd1082dfc86d3d3
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_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
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/transactions.py transactions.py-20051007010900-f1313d53cf58e223
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
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/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/util/configobj/validate.py validate.py-20051018184548-e700c5f98afa9389
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
------------------------------------------------------------
merged: robertc at robertcollins.net-20060222233130-dfffba0d31e6a77a
parent: pqm at pqm.ubuntu.com-20060222222053-2c5bf0ca6e71f18d
parent: robertc at robertcollins.net-20060222230229-d5e0fb4ab1f46d9a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-02-23 10:31:30 +1100
message:
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060222230229-d5e0fb4ab1f46d9a
parent: robertc at robertcollins.net-20060222055846-190a2944772a7125
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-02-23 10:02:29 +1100
message:
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060222055846-190a2944772a7125
parent: robertc at robertcollins.net-20060222054547-70f045f317b7993b
parent: robertc at robertcollins.net-20060222055644-1c843d87efc1c539
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-02-22 16:58:46 +1100
message:
Merge in ui for creating and converting to knit branch - no backend support yet.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060222055644-1c843d87efc1c539
parent: robertc at robertcollins.net-20060221124257-8ee8f4b0b3b45ac3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-new-repo-format
timestamp: Wed 2006-02-22 16:56:44 +1100
message:
Review feedback.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221124257-8ee8f4b0b3b45ac3
parent: robertc at robertcollins.net-20060221054521-b26e1fd3b723dc00
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-new-repo-format
timestamp: Tue 2006-02-21 23:42:57 +1100
message:
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221054521-b26e1fd3b723dc00
parent: robertc at robertcollins.net-20060221015126-bde20d0239fd8c47
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-new-repo-format
timestamp: Tue 2006-02-21 16:45:21 +1100
message:
Rearrangment of Repository logic to be less type code driven, and bugfix InterRepository.missing_revision_ids
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221015126-bde20d0239fd8c47
parent: robertc at robertcollins.net-20060221004343-ccf22f64d96aa17d
parent: robertc at robertcollins.net-20060221014955-c8bdf2cae88c5e34
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-new-repo-format
timestamp: Tue 2006-02-21 12:51:26 +1100
message:
Merge in InterRepository api to have it available.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221014955-c8bdf2cae88c5e34
parent: robertc at robertcollins.net-20060221000809-e41f2f69a365093f
parent: robertc at robertcollins.net-20060221004343-ccf22f64d96aa17d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Tue 2006-02-21 12:49:55 +1100
message:
Merge from bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221004343-ccf22f64d96aa17d
parent: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-02-21 11:43:43 +1100
message:
Move the SFTP URL change for relative and absolute paths to the right place in NEWS.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
parent: pqm at pqm.ubuntu.com-20060219235508-029a9d591a35f189
parent: robertc at robertcollins.net-20060220002935-c653f31ef30cadff
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-02-20 04:39:19 +0000
message:
Merge push/pull and branching within repositories bugfix.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220002935-c653f31ef30cadff
parent: robertc at robertcollins.net-20060215221605-09ef2fed453334c6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2006-02-20 11:29:35 +1100
message:
Allow push/pull and branch between branches in the same shared 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-20060214065221-23180801f3c7cb18
parent: robertc at robertcollins.net-20060214064406-f4e4db1399d7069d
parent: robertc at robertcollins.net-20060213220923-96b1df85739f0d8c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-02-14 17:52:21 +1100
message:
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
behaviour. They use the existing serverless-mode and store no data
locally. As such they are not suitable for use except in high bandwidth
low latency environments like LAN's or local disk. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213220923-96b1df85739f0d8c
parent: robertc at robertcollins.net-20060213215205-cb3bacc87092a639
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Tue 2006-02-14 09:09:23 +1100
message:
Forgot to update the last warn() to reference WorkingTree.open().
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213215205-cb3bacc87092a639
parent: robertc at robertcollins.net-20060212125715-75abf487b5ee1f5a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Tue 2006-02-14 08:52:05 +1100
message:
Update per review comments.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060212125715-75abf487b5ee1f5a
parent: robertc at robertcollins.net-20060212102856-bdc8733fbacfa73c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Sun 2006-02-12 23:57:15 +1100
message:
Add update command for use with checkouts.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060212102856-bdc8733fbacfa73c
parent: robertc at robertcollins.net-20060212101913-bc160919173fc028
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Sun 2006-02-12 21:28:56 +1100
message:
Test that the working tree last revision is indeed set during commit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060212101913-bc160919173fc028
parent: robertc at robertcollins.net-20060212094015-0fba37745716a3d9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Sun 2006-02-12 21:19:13 +1100
message:
implement out of date working tree checks in commit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060212094015-0fba37745716a3d9
parent: robertc at robertcollins.net-20060211231807-30cf1893956ebb07
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Sun 2006-02-12 20:40:15 +1100
message:
Implement -r limit for checkout command.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060211231807-30cf1893956ebb07
parent: robertc at robertcollins.net-20060211115806-732dabc1e35714ed
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Sun 2006-02-12 10:18:07 +1100
message:
Create a checkout command.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060211115806-732dabc1e35714ed
parent: robertc at robertcollins.net-20060210125935-fd07ea9a67b299d9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Sat 2006-02-11 22:58:06 +1100
message:
Give format3 working trees their own last-revision marker.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060210125935-fd07ea9a67b299d9
parent: robertc at robertcollins.net-20060110105314-c7cb6a57c52477bd
parent: robertc at robertcollins.net-20060210123118-b4edbe22441ec029
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Fri 2006-02-10 23:59:35 +1100
message:
Merge in bzrdir work to enable checkout improvements.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060210123118-b4edbe22441ec029
parent: robertc at robertcollins.net-20060210110338-60cc15f6fadf02c1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2006-02-10 23:31:18 +1100
message:
Test the disk layout of format3 working trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060210110338-60cc15f6fadf02c1
parent: robertc at robertcollins.net-20060208061510-87fac5de56491872
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2006-02-10 22:03:38 +1100
message:
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060208061510-87fac5de56491872
parent: robertc at robertcollins.net-20060208052453-cdbadf93fb7822ee
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Wed 2006-02-08 17:15:10 +1100
message:
Provide a revision.get_history(repository) method for generating a synthetic revision history.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060208052453-cdbadf93fb7822ee
parent: robertc at robertcollins.net-20060206034527-030f392f27eb1bc6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Wed 2006-02-08 16:24:53 +1100
message:
Make needs_read_lock and needs_write_lock more visible in tracebacks
------------------------------------------------------------
merged: robertc at robertcollins.net-20060206034527-030f392f27eb1bc6
parent: robertc at robertcollins.net-20060203021848-4159dfb7a3778151
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2006-02-06 14:45:27 +1100
message:
Split out repository into .bzr/repository
------------------------------------------------------------
merged: robertc at robertcollins.net-20060203021848-4159dfb7a3778151
parent: robertc at robertcollins.net-20060202114532-6f7ff10cbd86448c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2006-02-03 13:18:48 +1100
message:
Nearly complete .bzr/checkout splitout.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060202114532-6f7ff10cbd86448c
parent: robertc at robertcollins.net-20060202085718-d8e121b420d4c76e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Thu 2006-02-02 22:45:32 +1100
message:
Start WorkingTree -> .bzr/checkout transition
------------------------------------------------------------
merged: robertc at robertcollins.net-20060202085718-d8e121b420d4c76e
parent: robertc at robertcollins.net-20060202001402-7d7900a210fccdac
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Thu 2006-02-02 19:57:18 +1100
message:
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060202001402-7d7900a210fccdac
parent: robertc at robertcollins.net-20060201232934-8c2e49d220f5a52f
parent: robertc at robertcollins.net-20060201211329-b3faf2a411316ff7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-02 11:14:02 +1100
message:
Merge from integration
------------------------------------------------------------
merged: robertc at robertcollins.net-20060201211329-b3faf2a411316ff7
parent: robertc at robertcollins.net-20060131044410-50e7a77576907473
parent: john at arbash-meinel.com-20060201141338-d211b93a6adfa691
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-02-02 08:13:29 +1100
message:
Merge from jam-integration.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060201141338-d211b93a6adfa691
parent: john at arbash-meinel.com-20060201140859-95012ca532c0172b
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-02-01 08:13:38 -0600
message:
[merge] bzr.dev 1528, including branch-formats
------------------------------------------------------------
merged: 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
------------------------------------------------------------
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-20060125055408-decd09a9f3f91658
parent: robertc at robertcollins.net-20060125051006-40a8d9a16a765f79
parent: john at arbash-meinel.com-20060124191602-681e9da1f16e695e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-01-25 16:54:08 +1100
message:
Merge from jam-integration.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060124191602-681e9da1f16e695e
parent: john at arbash-meinel.com-20060124161142-546e0937e4d41f13
parent: abentley at panoramicfeedback.com-20060124153355-8d91160257425086
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-24 13:16:02 -0600
message:
[merge] bzr.ab: Make merge internals private.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124153355-8d91160257425086
parent: abentley at panoramicfeedback.com-20060123181322-30c089803263530b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Tue 2006-01-24 10:33:55 -0500
message:
Fixed up non-absolute imports
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060123181322-30c089803263530b
parent: abentley at panoramicfeedback.com-20060123144949-0ec7474cc54bd4d2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Mon 2006-01-23 13:13:22 -0500
message:
Moved merge.merge to builtins
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060123144949-0ec7474cc54bd4d2
parent: aaron.bentley at utoronto.ca-20060122175648-4627d7fec6ad721c
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Mon 2006-01-23 09:49:49 -0500
message:
Dirty merge from mainline
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
parent: mbp at sourcefrog.net-20060119091139-d925dfcfdeef7109
parent: robertc at robertcollins.net-20060121104713-1ccd09539b35a07b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-23 13:09:39 +1100
message:
[merge] robert's integration
------------------------------------------------------------
merged: robertc at robertcollins.net-20060121104713-1ccd09539b35a07b
parent: robertc at robertcollins.net-20060121104246-604e9a6a3eb8e10b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-01-21 21:47:13 +1100
message:
Format tweaks for latest merges.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060121104246-604e9a6a3eb8e10b
parent: robertc at robertcollins.net-20060121095439-042130d88768fcb2
parent: john at arbash-meinel.com-20060120193409-1466a4908863d28f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-01-21 21:42:46 +1100
message:
Merge from jam-integration.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060120193409-1466a4908863d28f
parent: john at arbash-meinel.com-20060120182322-5294bc7c5bdf3aad
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2006-01-20 13:34:09 -0600
message:
Get revisions after we get inventories.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060120182322-5294bc7c5bdf3aad
parent: john at arbash-meinel.com-20060119231442-b842ad9c4c2e47fc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Fri 2006-01-20 12:23:22 -0600
message:
[patch] Aaron Bentley: Merge deletes foo.new
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119231442-b842ad9c4c2e47fc
parent: john at arbash-meinel.com-20060117220146-ac8eec58ef8b1123
parent: john at arbash-meinel.com-20060119225642-573470adf632d423
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-01-19 17:14:42 -0600
message:
[merge] 0.7-bugfix: Fix fileid_involved to unescape xml characters, fix StubServer to handle paramiko > 1.5.2
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119225642-573470adf632d423
parent: john at arbash-meinel.com-20060119221917-4f1fa4b42fc19b62
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-0.7-bugfix
timestamp: Thu 2006-01-19 16:56:42 -0600
message:
PEP8 comment fixes, and spelling error fix.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119221917-4f1fa4b42fc19b62
parent: john at arbash-meinel.com-20060119221801-9d6a48e4c22f56a8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-0.7-bugfix
timestamp: Thu 2006-01-19 16:19:17 -0600
message:
Cleanup getattr() code, since getattr(None, '', None) still works
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119221801-9d6a48e4c22f56a8
parent: john at arbash-meinel.com-20060119220047-effbc2821250761f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-0.7-bugfix
timestamp: Thu 2006-01-19 16:18:01 -0600
message:
Add an assert that fileid_involved won't be used if the branch format hasn't been determined to work with it. And a TODO about what needs to be fixed for weave inclusions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119220047-effbc2821250761f
parent: john at arbash-meinel.com-20060119212501-cb28cf532a878c41
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-0.7-bugfix
timestamp: Thu 2006-01-19 16:00:47 -0600
message:
Added copyright statement to test_fileid_involved, and minor pep8 cleanup.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119212501-cb28cf532a878c41
parent: john at arbash-meinel.com-20060119203609-c72700dcc1c4fc9d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-0.7-bugfix
timestamp: Thu 2006-01-19 15:25:01 -0600
message:
fileid_involved needs to unescape the file id and revision id
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119203609-c72700dcc1c4fc9d
parent: mbp at sourcefrog.net-20060118134553-29e4f4aa94391a25
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-0.7-bugfix
timestamp: Thu 2006-01-19 14:36:09 -0600
message:
Bugfix to allow using paramiko > 1.5.2
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060118134553-29e4f4aa94391a25
parent: mbp at sourcefrog.net-20060118134516-86e44fc139ce6aa2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-19 00:45:53 +1100
message:
bump version to 0.7rc2
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060118134516-86e44fc139ce6aa2
parent: mbp at sourcefrog.net-20060113073748-d6893fbd5454d5a4
parent: ghigo at therra.bhome-20051215213704-f591469a7e3bf212
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-19 00:45:16 +1100
message:
[merge] (Goffredo) faster merge/fetch by peeking into weave
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215213704-f591469a7e3bf212
parent: ghigo at therra.bhome-20051215211628-f550b3c938813a22
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr-file_involved
timestamp: Thu 2005-12-15 22:37:04 +0100
message:
renamed test_file_involved -> test_fileid_involved
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215211628-f550b3c938813a22
parent: ghigo at therra.bhome-20051215205928-ee0dbb06205ab6a1
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr-file_involved
timestamp: Thu 2005-12-15 22:16:28 +0100
message:
small clean-up
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215205928-ee0dbb06205ab6a1
parent: ghigo at therra.bhome-20051215200704-3f398740a310033d
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 21:59:28 +0100
message:
added test for function fileid_involved
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215200704-3f398740a310033d
parent: ghigo at therra.bhome-20051215200546-900e3dc770fb9501
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 21:07:04 +0100
message:
Small cleanup
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215200546-900e3dc770fb9501
parent: ghigo at therra.bhome-20051215195642-afce9fdbdf879e31
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 21:05:46 +0100
message:
The patch changes the way in which the code gets the list of the file_id of the
inventory. Before the code used the listable property of the transport ( not
available in the http transport ) in order to get every file_id contained under
.bzr/weave.
Now the code gets the file_id involved via the file_involved( ) function.
The big gain is that isn't anymore necessary to expand every inventory due
to the existence of the file_involved( ) function to know which file_id had to
be download.
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215195642-afce9fdbdf879e31
parent: ghigo at therra.bhome-20051215195219-41bb08fac33bc5dc
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 20:56:42 +0100
message:
Apply some style changes on the basis of Robert suggest
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215195219-41bb08fac33bc5dc
parent: ghigo at therra.bhome-20051215194529-ab98fb6ad0080d87
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 20:52:19 +0100
message:
This patch changes the fetch code. Before, the original code expanded every inventory and
copied/joined the changed weave. After that it merged the single inventory to the
local inventory weave.
Now the code get ( via the file_involved() function ) the file_id involved, then
copies/joins the weave changed. After that the new code merges the two inventory
(remote and local ). The big gain is that it isn't necessary anymore to expand
and merge every single inventory.
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215194529-ab98fb6ad0080d87
parent: ghigo at therra.bhome-20051215193435-23c282cfdea1711a
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 20:45:29 +0100
message:
- implemented some suggestion by Robert Collins
- renamed the function file_involved in fileid_involved*
- removed the check of the revision_id
------------------------------------------------------------
merged: ghigo at therra.bhome-20051215193435-23c282cfdea1711a
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Goffredo Baroncelli <ghigo at therra.bhome>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2005-12-15 20:34:35 +0100
message:
function file_involved added
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060113073748-d6893fbd5454d5a4
parent: mbp at sourcefrog.net-20060113055200-7e197ac9ec1326f1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-13 18:37:48 +1100
message:
[cherrypick] Hold locks around entire diff operations to avoid thrashing
hashcache. (from denys)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060113055200-7e197ac9ec1326f1
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-13 16:52:00 +1100
message:
[patch] stat-cache fixes from Denys
------------------------------------------------------------
merged: john at arbash-meinel.com-20060117220146-ac8eec58ef8b1123
parent: john at arbash-meinel.com-20060116221250-28226bfc996ecb4d
parent: denys.duchier at mozart-oz.org-20060117161257-d1f67475c18d9b32
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-17 16:01:46 -0600
message:
[merge] Denys Duchier: fix revisionspec to allow branch:../otherbranch
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060117161257-d1f67475c18d9b32
parent: denys.duchier at mozart-oz.org-20060117153121-cd6ea3ce58ecef5c
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.fix.revisionspec
timestamp: Tue 2006-01-17 17:12:57 +0100
message:
order MODULES_TO_DOCTEST alphabetically
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060117153121-cd6ea3ce58ecef5c
parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.fix.revisionspec
timestamp: Tue 2006-01-17 16:31:21 +0100
message:
distinguish ../ as path to branch and .. as revspec separator
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116221250-28226bfc996ecb4d
parent: john at arbash-meinel.com-20060112060603-635de5933db78304
parent: john at arbash-meinel.com-20060116220752-f88bd067eb868bfb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2006-01-16 16:12:50 -0600
message:
[merge] jam-pending: bzr.dev + give correct error message when not in working tree.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116220752-f88bd067eb868bfb
parent: john at arbash-meinel.com-20060116202007-9b9239c2f521d257
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Mon 2006-01-16 16:07:52 -0600
message:
Cleanup from Robert Collins.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116202007-9b9239c2f521d257
parent: john at arbash-meinel.com-20060116195945-1ead0dc4979d3aeb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Mon 2006-01-16 14:20:07 -0600
message:
Adding fix + test for correct error message when not in branch.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116195945-1ead0dc4979d3aeb
parent: john at arbash-meinel.com-20060116194637-21cc1999f1f38cb2
parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Mon 2006-01-16 13:59:45 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20060116194637-21cc1999f1f38cb2
parent: john at arbash-meinel.com-20060108235253-6d04ece651878697
parent: john at arbash-meinel.com-20060112060603-635de5933db78304
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Mon 2006-01-16 13:46:37 -0600
message:
[merge] jam-integration 1503
------------------------------------------------------------
merged: john at arbash-meinel.com-20060112060603-635de5933db78304
parent: john at arbash-meinel.com-20060111214111-dc7ac5a25f1ed038
parent: robertc at robertcollins.net-20060112024225-fe991391e088dd58
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-01-12 00:06:03 -0600
message:
[merge] Robert Collins integration.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060111214111-dc7ac5a25f1ed038
parent: john at arbash-meinel.com-20060110203919-6fd543601354ecc2
parent: denys.duchier at mozart-oz.org-20060111191838-1aa7989945935f65
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-01-11 15:41:11 -0600
message:
[merge] Denys Duchier bzr.cleanup revno 1500: a few small code cleanups
------------------------------------------------------------
merged: john at arbash-meinel.com-20060110203919-6fd543601354ecc2
parent: john at arbash-meinel.com-20060110153622-7c751e4607688cee
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-10 14:39:19 -0600
message:
[patch] Robey Pointer: diff -r 1.. should diff against working tree.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060110153622-7c751e4607688cee
parent: john at arbash-meinel.com-20060110141623-7e8353f78097e303
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-10 09:36:22 -0600
message:
uncommit doesn't need to read inventories since it doesn't do cleanup.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060110141623-7e8353f78097e303
parent: john at arbash-meinel.com-20060109044324-0e6d4e5bc6a180c1
parent: denys.duchier at mozart-oz.org-20060109235237-c332fdaf6843931c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-10 08:16:23 -0600
message:
[merge] Denys Duchier bzr.patches: remove apply_changeset and get_inventory_tree
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060109235237-c332fdaf6843931c
parent: denys.duchier at mozart-oz.org-20060109213204-bfc723a545be8093
parent: denys.duchier at mozart-oz.org-20060109212309-919eac90ed3bb881
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.patches
timestamp: Tue 2006-01-10 00:52:37 +0100
message:
merged in removal of apply_changeset and get_inventory_change after getting +2 on it
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060109213204-bfc723a545be8093
parent: denys.duchier at mozart-oz.org-20051223182436-196e481a0d75b65d
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.patches
timestamp: Mon 2006-01-09 22:32:04 +0100
message:
merged from trunk
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051223182436-196e481a0d75b65d
parent: denys.duchier at mozart-oz.org-20051222190314-bc62a9e63173500a
parent: denys.duchier at mozart-oz.org-20051221231921-e38aacd973ce2e59
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.patches
timestamp: Fri 2005-12-23 19:24:36 +0100
message:
merged bzr.tests up to revision 1494
------------------------------------------------------------
merged: john at arbash-meinel.com-20060109044324-0e6d4e5bc6a180c1
parent: john at arbash-meinel.com-20060108235552-c8b2f2f3f5830f89
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2006-01-08 22:43:24 -0600
message:
[merge] bzr.dev 1515
------------------------------------------------------------
merged: john at arbash-meinel.com-20060108235552-c8b2f2f3f5830f89
parent: john at arbash-meinel.com-20060104234532-14bf2cb2a1e65ba8
parent: john at arbash-meinel.com-20060108235253-6d04ece651878697
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2006-01-08 17:55:52 -0600
message:
[merge] jam-pending 1502: remove ancestry.weave, remove --all from uncommit.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060108235253-6d04ece651878697
parent: john at arbash-meinel.com-20060108233437-0e37ff512b0219be
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Sun 2006-01-08 17:52:53 -0600
message:
Adding TODO to upgrade.py to remove ancestry.weave
------------------------------------------------------------
merged: john at arbash-meinel.com-20060108233437-0e37ff512b0219be
parent: john at arbash-meinel.com-20060106153621-671372fb0c7eb964
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Sun 2006-01-08 17:34:37 -0600
message:
Added TODO for bzr uncommit to remove unreferenced information.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060106153621-671372fb0c7eb964
parent: john at arbash-meinel.com-20060103195412-a14e7c169cda46ba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2006-01-06 09:36:21 -0600
message:
Removed --all from bzr uncommit, it was broken anyway.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103195412-a14e7c169cda46ba
parent: john at arbash-meinel.com-20060103151011-2ad890a2ff1475a4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-01-03 13:54:12 -0600
message:
don't create ancestry.weave
------------------------------------------------------------
merged: john at arbash-meinel.com-20060104234532-14bf2cb2a1e65ba8
parent: john at arbash-meinel.com-20060103154418-e6b640e95a1d0e03
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-01-04 17:45:32 -0600
message:
[patch] Wouter Bolsterlee: Fix ftp error in error handling code
------------------------------------------------------------
merged: robertc at robertcollins.net-20060121095439-042130d88768fcb2
parent: robertc at robertcollins.net-20060118011340-ab7ab3d0ecc47c0f
parent: mbp at sourcefrog.net-20060118082354-b28f3ecdecc245b2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-01-21 20:54:39 +1100
message:
Merge from mpool.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060118082354-b28f3ecdecc245b2
parent: mbp at sourcefrog.net-20060113081222-6b572004a2ade0cc
parent: ghigo at therra.bhome-20051215213704-f591469a7e3bf212
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.fileid-involved
timestamp: Wed 2006-01-18 19:23:54 +1100
message:
[merge] goffredo's fetch/clone improvements
These speed up the operations by peeking into the inventory weave to see which
files are affected without extracting every inventory version.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060113081222-6b572004a2ade0cc
parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
parent: denys.duchier at mozart-oz.org-20060112161054-90a5f1b649d87ee0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-13 19:12:22 +1100
message:
[merge] test_hashcache_raise from Denys
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060112161054-90a5f1b649d87ee0
parent: denys.duchier at mozart-oz.org-20060112092814-aa4a8fc83ad6df5e
parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.patches
timestamp: Thu 2006-01-12 17:10:54 +0100
message:
sync with bzr.dev mainline
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060112092814-aa4a8fc83ad6df5e
parent: denys.duchier at mozart-oz.org-20060109235237-c332fdaf6843931c
parent: denys.duchier at mozart-oz.org-20060112012636-dde78a3a3314b5aa
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.patches
timestamp: Thu 2006-01-12 10:28:14 +0100
message:
merged hashcache test after +2 approval
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060112012636-dde78a3a3314b5aa
parent: denys.duchier at mozart-oz.org-20060112003410-a96048b76f8c6fa9
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Thu 2006-01-12 02:26:36 +0100
message:
test_hashcache_raise: minor space fix
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060112003410-a96048b76f8c6fa9
parent: denys.duchier at mozart-oz.org-20060111225357-972e0c46ca0e5263
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Thu 2006-01-12 01:34:10 +0100
message:
test_hashcache: catch no exceptions
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111225357-972e0c46ca0e5263
parent: denys.duchier at mozart-oz.org-20060111215238-78996c3541a0b637
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Wed 2006-01-11 23:53:57 +0100
message:
test_hashcache_raise: complain if no weird file type can be created
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111215238-78996c3541a0b637
parent: denys.duchier at mozart-oz.org-20060111201505-42a209128c43128b
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Wed 2006-01-11 22:52:38 +0100
message:
simplified test_hashcache_raise as advised by jam
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111201505-42a209128c43128b
parent: denys.duchier at mozart-oz.org-20060109211151-7714c42575b9a601
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Wed 2006-01-11 21:15:05 +0100
message:
check that hashcache can raise BzrError
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060109211151-7714c42575b9a601
parent: denys.duchier at mozart-oz.org-20051221231921-e38aacd973ce2e59
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Mon 2006-01-09 22:11:51 +0100
message:
merged from trunk
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060119091139-d925dfcfdeef7109
parent: mbp at sourcefrog.net-20060118082354-b28f3ecdecc245b2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-19 20:11:39 +1100
message:
Fix 'bzr added' typo, and tests for that command.
Patch from Nathan McCallum.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060122175648-4627d7fec6ad721c
parent: abentley at panoramicfeedback.com-20060120142258-9d09d6ff707ebd1f
parent: mbp at sourcefrog.net-20060118082354-b28f3ecdecc245b2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2006-01-22 12:56:48 -0500
message:
Merged mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060120142258-9d09d6ff707ebd1f
parent: aaron.bentley at utoronto.ca-20060118015458-ba73c07352e1af17
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Fri 2006-01-20 09:22:58 -0500
message:
Removed _merge, renamed MergeConflictHandler to _MergeConflictHandler
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060118015458-ba73c07352e1af17
parent: aaron.bentley at utoronto.ca-20060118015327-fa38a0453f973320
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-01-17 20:54:58 -0500
message:
More PEP8 fixes
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060118015327-fa38a0453f973320
parent: aaron.bentley at utoronto.ca-20060118014518-b39b5e04f9d6d3c3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-01-17 20:53:27 -0500
message:
PEP8 fixes
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060118014518-b39b5e04f9d6d3c3
parent: abentley at panoramicfeedback.com-20060117214005-4ca4d0b6dc86f1d6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-01-17 20:45:18 -0500
message:
Updated following j-a-meinel's comments
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117214005-4ca4d0b6dc86f1d6
parent: abentley at panoramicfeedback.com-20060117210942-353e1f1c77a1b6b4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Tue 2006-01-17 16:40:05 -0500
message:
Oops. Forgot _merge.py
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117210942-353e1f1c77a1b6b4
parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Tue 2006-01-17 16:09:42 -0500
message:
Made the merge internals private
------------------------------------------------------------
merged: john at arbash-meinel.com-20060124161142-546e0937e4d41f13
parent: john at arbash-meinel.com-20060123152612-7bd1aa62799600e4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-24 10:11:42 -0600
message:
[patch] Aaron Bentley: make revert work in a subdirectory.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060123152612-7bd1aa62799600e4
parent: john at arbash-meinel.com-20060120193409-1466a4908863d28f
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2006-01-23 09:26:12 -0600
message:
[merge] bzr.dev 1524
------------------------------------------------------------
merged: robertc at robertcollins.net-20060125051006-40a8d9a16a765f79
parent: robertc at robertcollins.net-20060125014801-fbeeac15abb1638c
parent: robertc at robertcollins.net-20060125042316-66666bc57f41fb0c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-01-25 16:10:06 +1100
message:
* The internal storage of history, and logical branch identity have now
been split into Branch, and Repository. The common locking and file
management routines are now in bzrlib.lockablefiles.
(Aaron Bentley, Robert Collins, Martin Pool)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060125042316-66666bc57f41fb0c
parent: robertc at robertcollins.net-20060125014334-8dd9ed73c26c5956
parent: robertc at robertcollins.net-20060125014801-fbeeac15abb1638c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Wed 2006-01-25 15:23:16 +1100
message:
Merge integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060125014801-fbeeac15abb1638c
parent: robertc at robertcollins.net-20060124102908-b4a31bf2a3d67913
parent: robey at dhcp-192-168-1-88.danger.com-20060124190413-0bb880bf3a3247c3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-01-25 12:48:01 +1100
message:
One more warn->warning typo from Robey Pointer.
------------------------------------------------------------
merged: robey at dhcp-192-168-1-88.danger.com-20060124190413-0bb880bf3a3247c3
parent: robey at master-shake.local-20060124173248-5ca94b076ad0d4f5
committer: Robey Pointer <robey at dhcp-192-168-1-88.danger.com>
branch nick: bzr.dev.sftp
timestamp: Tue 2006-01-24 11:04:13 -0800
message:
correct another misspelling of warning
------------------------------------------------------------
merged: robey at master-shake.local-20060124173248-5ca94b076ad0d4f5
parent: robey at dhcp-192-168-1-88.danger.com-20060123220545-a158fe0ed3995768
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.dev.sftp
timestamp: Tue 2006-01-24 09:32:48 -0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at dhcp-192-168-1-88.danger.com-20060123220545-a158fe0ed3995768
parent: robey at master-shake.local-20060123081338-82df2d3377709920
committer: Robey Pointer <robey at dhcp-192-168-1-88.danger.com>
branch nick: bzr.dev.sftp
timestamp: Mon 2006-01-23 14:05:45 -0800
message:
use alternate form of getattr(st_mode) for people using paramiko snapshots
------------------------------------------------------------
merged: robey at master-shake.local-20060123081338-82df2d3377709920
parent: robey at master-shake.local-20060123081235-66864912ac0de40b
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.dev.sftp
timestamp: Mon 2006-01-23 00:13:38 -0800
message:
add a single full-handshake test to verify that sftp-over-ssh works
------------------------------------------------------------
merged: robey at master-shake.local-20060123081235-66864912ac0de40b
parent: robey at master-shake.local-20060123051335-663b18ee5ae90126
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.dev.sftp
timestamp: Mon 2006-01-23 00:12:35 -0800
message:
spell warning correctly :) and move recv_ready close to recv for readability
------------------------------------------------------------
merged: robey at master-shake.local-20060123051335-663b18ee5ae90126
parent: robey at master-shake.local-20060123031251-b0e2bf22b0c91852
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.dev.sftp
timestamp: Sun 2006-01-22 21:13:35 -0800
message:
ask paramiko to log into the bzr logging tree during unit tests, and log a warning when the server thread exits due to exception
------------------------------------------------------------
merged: robey at master-shake.local-20060123031251-b0e2bf22b0c91852
parent: mbp at sourcefrog.net-20060118082354-b28f3ecdecc245b2
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.dev.sftp
timestamp: Sun 2006-01-22 19:12:51 -0800
message:
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
------------------------------------------------------------
merged: robertc at robertcollins.net-20060124102908-b4a31bf2a3d67913
parent: robertc at robertcollins.net-20060124065059-1fcad84661b00b40
parent: robey at dhcp-192-168-1-88.danger.com-20060123220545-a158fe0ed3995768
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-24 21:29:08 +1100
message:
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
for testing SFTP protocol support. (Robey Pointer)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060124065059-1fcad84661b00b40
parent: robertc at robertcollins.net-20060121104713-1ccd09539b35a07b
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-24 17:50:59 +1100
message:
Merge from bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060125014334-8dd9ed73c26c5956
parent: robertc at robertcollins.net-20060124214346-c148443fda65c8b8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Wed 2006-01-25 12:43:34 +1100
message:
Implement final review suggestions.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060124214346-c148443fda65c8b8
parent: robertc at robertcollins.net-20060118030939-c5c7106140cf444f
parent: mbp at sourcefrog.net-20060113065759-13605598ac561067
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Wed 2006-01-25 08:43:46 +1100
message:
Merge from mpool
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060113065759-13605598ac561067
parent: mbp at sourcefrog.net-20060113063856-484eed116191727b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.storage
timestamp: Fri 2006-01-13 17:57:59 +1100
message:
review fixups from John
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060113063856-484eed116191727b
parent: mbp at sourcefrog.net-20060112084859-62f2a2c71e50d442
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.storage
timestamp: Fri 2006-01-13 17:38:56 +1100
message:
Pass through wrapped function name and docstrign
in needs_read_lock and needs_write_lock decorators. Test this works.
(Suggestion from John)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060112084859-62f2a2c71e50d442
parent: mbp at sourcefrog.net-20060112083710-642730d8ae44f906
parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.storage
timestamp: Thu 2006-01-12 19:48:59 +1100
message:
[merge] robertc via bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060112083710-642730d8ae44f906
parent: mbp at sourcefrog.net-20060112065123-387e10eb3b38d7fa
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.storage
timestamp: Thu 2006-01-12 19:37:10 +1100
message:
Various updates to make storage branch mergeable:
* remove duplication of needs_read_lock, needs_write_lock decorators,
and move them into bzrlib.decorators
* add Branch.peek_lock_mode
* some docs
* fix up merge flux in tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060112065123-387e10eb3b38d7fa
parent: mbp at sourcefrog.net-20060112061522-cbd17c5ab7494910
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.storage
timestamp: Thu 2006-01-12 17:51:23 +1100
message:
Fix funny mistake
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060112061522-cbd17c5ab7494910
parent: robertc at robertcollins.net-20060111235551-2450cf1d30a24fe8
parent: mbp at sourcefrog.net-20060112045444-cc2e49b5bae40e06
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.storage
timestamp: Thu 2006-01-12 17:15:22 +1100
message:
[merge] from bzr.dev
------------------------------------------------------------
merged: robertc at robertcollins.net-20060111235551-2450cf1d30a24fe8
parent: robertc at robertcollins.net-20060105024144-8dd09688a5c0be4d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Thu 2006-01-12 10:55:51 +1100
message:
add TODO.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105024144-8dd09688a5c0be4d
parent: robertc at robertcollins.net-20060105013144-320b880da4924bc0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Thu 2006-01-05 13:41:44 +1100
message:
update tests somewhat
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105013144-320b880da4924bc0
parent: robertc at robertcollins.net-20060105003335-aff31a8e6463ed87
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Thu 2006-01-05 12:31:44 +1100
message:
lockable_files was extracted from branch.py - give it a copyright statement
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105003335-aff31a8e6463ed87
parent: robertc at robertcollins.net-20060105003057-8325b00303742414
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Thu 2006-01-05 11:33:35 +1100
message:
Update branch todo.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105003057-8325b00303742414
parent: robertc at robertcollins.net-20060105001601-41706f37af6ae182
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Thu 2006-01-05 11:30:57 +1100
message:
Update test__escape to new relative-path behaviour.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105001601-41706f37af6ae182
parent: robertc at robertcollins.net-20060104233504-e812d974dcf90849
parent: john at arbash-meinel.com-20060103212343-7d62a25f4a6e4ac8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Thu 2006-01-05 11:16:01 +1100
message:
Merge from jam-storage.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103212343-7d62a25f4a6e4ac8
parent: john at arbash-meinel.com-20060103165510-9218245d08424426
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-storage
timestamp: Tue 2006-01-03 15:23:43 -0600
message:
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103165510-9218245d08424426
parent: robertc at robertcollins.net-20060103061804-df9a331ca2af48a4
parent: john at arbash-meinel.com-20060103154418-e6b640e95a1d0e03
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-storage
timestamp: Tue 2006-01-03 10:55:10 -0600
message:
[merge] jam-integration 1495
------------------------------------------------------------
merged: robertc at robertcollins.net-20060103061804-df9a331ca2af48a4
parent: robertc at robertcollins.net-20060103044402-66a4f012627e7f24
parent: robertc at robertcollins.net-20060102225445-8554f5b0109dbc41
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Tue 2006-01-03 17:18:04 +1100
message:
Merge from integration, mode-changes are broken.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060103044402-66a4f012627e7f24
parent: robertc at robertcollins.net-20051207044813-9274c8afaee3fcbb
parent: aaron.bentley at utoronto.ca-20051226045422-91dda93d1e9fb2ba
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Tue 2006-01-03 15:44:02 +1100
message:
Merge from Aaron.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226045422-91dda93d1e9fb2ba
parent: aaron.bentley at utoronto.ca-20051226044338-1368eef04da9ee0c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 23:54:22 -0500
message:
Moved the .bzr constraint out of LockableFiles
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226044338-1368eef04da9ee0c
parent: aaron.bentley at utoronto.ca-20051226014806-5c0a9fceb1f7995c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 23:43:38 -0500
message:
Removed LockableFiles.make_transport
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226014806-5c0a9fceb1f7995c
parent: aaron.bentley at utoronto.ca-20051226014616-631090d43006cb4a
parent: aaron.bentley at utoronto.ca-20051226005636-3a836e2766166570
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 20:48:06 -0500
message:
Merged transaction tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226005636-3a836e2766166570
parent: aaron.bentley at utoronto.ca-20051226005411-c3792ed46786d5c6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 19:56:36 -0500
message:
test transactions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226005411-c3792ed46786d5c6
parent: aaron.bentley at utoronto.ca-20051226001110-cf590f668a99ba1a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 19:54:11 -0500
message:
Test and fix read locks
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226001110-cf590f668a99ba1a
parent: aaron.bentley at utoronto.ca-20051225230624-f61a1538912a578a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 19:11:10 -0500
message:
Refactored a bit
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051225230624-f61a1538912a578a
parent: aaron.bentley at utoronto.ca-20051225224453-098a11d24b7edf84
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 18:06:24 -0500
message:
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051225224453-098a11d24b7edf84
parent: aaron.bentley at utoronto.ca-20051225211805-269cd3a50e5aa5fa
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 17:44:53 -0500
message:
Added write locks as appropriate
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051225211805-269cd3a50e5aa5fa
parent: aaron.bentley at utoronto.ca-20051225003913-9d453b78065f5c6b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 16:18:05 -0500
message:
Throw if we try to write to a LockableFiles with no write lock
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051225003913-9d453b78065f5c6b
parent: aaron.bentley at utoronto.ca-20051225003848-111ac71170cb2605
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sat 2005-12-24 19:39:13 -0500
message:
Tweaked some text
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051225003848-111ac71170cb2605
parent: aaron.bentley at utoronto.ca-20051222040342-5496534a029b1189
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sat 2005-12-24 19:38:48 -0500
message:
Renamed Branch.storage to Branch.repository
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051222040342-5496534a029b1189
parent: robertc at robertcollins.net-20051207044813-9274c8afaee3fcbb
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Wed 2005-12-21 23:03:42 -0500
message:
Merged the mainline
------------------------------------------------------------
merged: robertc at robertcollins.net-20051207044813-9274c8afaee3fcbb
parent: robertc at robertcollins.net-20051128231049-4152aa936f0e223b
parent: robertc at robertcollins.net-20051207030832-1f86f7bf2daeecf2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Wed 2005-12-07 15:48:13 +1100
message:
Merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051128231049-4152aa936f0e223b
parent: robertc at robertcollins.net-20051128220513-e93ff3c165095dc5
parent: aaron.bentley at utoronto.ca-20051128050209-c852ad87acb327c2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Tue 2005-11-29 10:10:49 +1100
message:
Merge from aaron. Whee, we are synced. Yay. Begone the foul demons of merge conflicts.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051128050209-c852ad87acb327c2
parent: aaron.bentley at utoronto.ca-20051125131549-a788fd1cc848a6f0
parent: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Mon 2005-11-28 00:02:09 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051125131549-a788fd1cc848a6f0
parent: aaron.bentley at utoronto.ca-20051125131420-7fb20bc9d128422c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Fri 2005-11-25 08:15:49 -0500
message:
Applied Jelmer's patch to make clone a branch operation
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051125131420-7fb20bc9d128422c
parent: aaron.bentley at utoronto.ca-20051125043047-420c01b3982f9cda
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Fri 2005-11-25 08:14:20 -0500
message:
Fixed selftest
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051125043047-420c01b3982f9cda
parent: aaron.bentley at utoronto.ca-20051120054855-4ac8db369aad5e06
parent: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Thu 2005-11-24 23:30:47 -0500
message:
Merged the mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051120054855-4ac8db369aad5e06
parent: aaron.bentley at utoronto.ca-20051118061745-e9bca6f2fa93a6a6
parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-11-20 00:48:55 -0500
message:
Renamed RevisionStorage to Repository
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051118061745-e9bca6f2fa93a6a6
parent: aaron.bentley at utoronto.ca-20051117052133-029fff5b7da6f46c
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Fri 2005-11-18 01:17:45 -0500
message:
Merged the mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051117052133-029fff5b7da6f46c
parent: aaron.bentley at utoronto.ca-20051117051454-e9ac1dd13766b978
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Thu 2005-11-17 00:21:33 -0500
message:
Renamed ControlFiles to LockableFiles
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051117051454-e9ac1dd13766b978
parent: aaron.bentley at utoronto.ca-20051117044529-517ac29466e34b57
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Thu 2005-11-17 00:14:54 -0500
message:
Moved get_ancestry to RevisionStorage
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051117044529-517ac29466e34b57
parent: aaron.bentley at utoronto.ca-20051112153640-fbdbd8814c78379e
parent: mbp at sourcefrog.net-20051116032119-119984187b55614a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Wed 2005-11-16 23:45:29 -0500
message:
Merged from mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051112153640-fbdbd8814c78379e
parent: aaron.bentley at utoronto.ca-20051112152533-d9bf05bf8c7e451f
parent: aaron.bentley at utoronto.ca-20051112153337-ab72703188dbde9a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sat 2005-11-12 10:36:40 -0500
message:
Merged fix for missing --verbose
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051112152533-d9bf05bf8c7e451f
parent: aaron.bentley at utoronto.ca-20051112151702-25c7bd32b3bd0b9e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sat 2005-11-12 10:25:33 -0500
message:
Removed unused code
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051112151702-25c7bd32b3bd0b9e
parent: aaron.bentley at utoronto.ca-20051111214727-470ea1838bbb1b3c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sat 2005-11-12 10:17:02 -0500
message:
Fixed inner merges in status
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051111214727-470ea1838bbb1b3c
parent: aaron.bentley at utoronto.ca-20051111213146-3813fd8b478e6adb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Fri 2005-11-11 16:47:27 -0500
message:
Fixed log command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051111213146-3813fd8b478e6adb
parent: aaron.bentley at utoronto.ca-20051111210525-21c745b7b4aa55d5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Fri 2005-11-11 16:31:46 -0500
message:
Fixed cat command
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051111210525-21c745b7b4aa55d5
parent: aaron.bentley at utoronto.ca-20051111202048-8fbda26405b21036
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Fri 2005-11-11 16:05:25 -0500
message:
Fixed locking-- all tests pass
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051111202048-8fbda26405b21036
parent: aaron.bentley at utoronto.ca-20051111201936-2b43b3723efb9a89
parent: aaron.bentley at utoronto.ca-20051111174611-05c622f83aca3d78
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Fri 2005-11-11 15:20:48 -0500
message:
Merge from bzr.ab
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051111201936-2b43b3723efb9a89
parent: aaron.bentley at utoronto.ca-20051109174311-247622bef3c8b28b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Fri 2005-11-11 15:19:36 -0500
message:
Refactored out ControlFiles and RevisionStore from _Branch
------------------------------------------------------------
merged: robertc at robertcollins.net-20051128220513-e93ff3c165095dc5
parent: robertc at robertcollins.net-20051121010322-15e0275dc516a7b3
parent: robertc at robertcollins.net-20051128083347-e792ce37b3ecd5a0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Tue 2005-11-29 09:05:13 +1100
message:
Merge from integration
------------------------------------------------------------
merged: robertc at robertcollins.net-20051121010322-15e0275dc516a7b3
parent: robertc at robertcollins.net-20051120233036-50fdcc7a156956ef
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-21 12:03:22 +1100
message:
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051120233036-50fdcc7a156956ef
parent: robertc at robertcollins.net-20051120223725-a6b98eceea29d023
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-21 10:30:36 +1100
message:
Disable inheritance for getting at LockableFiles, rather use composition.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051120223725-a6b98eceea29d023
parent: robertc at robertcollins.net-20051120223143-44c0a56ba3ed35c3
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-21 09:37:25 +1100
message:
Rename Controlfiles to LockableFiles.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051120223143-44c0a56ba3ed35c3
parent: aaron.bentley at utoronto.ca-20051112153640-fbdbd8814c78379e
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Mon 2005-11-21 09:31:43 +1100
message:
Bugfix missing so tests pass.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226014616-631090d43006cb4a
parent: aaron.bentley at utoronto.ca-20051226013944-2126b53ec3a9fb1e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 20:46:16 -0500
message:
Switched to locking README. (can't lock data files, it seems)
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226013944-2126b53ec3a9fb1e
parent: aaron.bentley at utoronto.ca-20051226005411-c3792ed46786d5c6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.revision-storage
timestamp: Sun 2005-12-25 20:39:44 -0500
message:
Fixed most bugs
------------------------------------------------------------
merged: robertc at robertcollins.net-20060104233504-e812d974dcf90849
parent: robertc at robertcollins.net-20060103061804-df9a331ca2af48a4
parent: robertc at robertcollins.net-20060104233225-7ce047eb1fca63ec
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Thu 2006-01-05 10:35:04 +1100
message:
Merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060118030939-c5c7106140cf444f
parent: robertc at robertcollins.net-20060118013726-2a00175620da6486
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Wed 2006-01-18 14:09:39 +1100
message:
Tweak storage towards mergability.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060118013726-2a00175620da6486
parent: robertc at robertcollins.net-20060117220903-5701b15dd567c264
parent: robertc at robertcollins.net-20060118011340-ab7ab3d0ecc47c0f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Wed 2006-01-18 12:37:26 +1100
message:
Merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060117220903-5701b15dd567c264
parent: robertc at robertcollins.net-20060111235551-2450cf1d30a24fe8
parent: mbp at sourcefrog.net-20060112084859-62f2a2c71e50d442
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Wed 2006-01-18 09:09:03 +1100
message:
merge from mbp storage branch.
------------------------------------------------------------
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.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
parent: mbp at sourcefrog.net-20060130062350-d6f25277ddcdfd79
parent: john at arbash-meinel.com-20060126183314-bed197fc11d30c17
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-30 22:55:34 +1100
message:
[merge] jam-pending small fixes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060126183314-bed197fc11d30c17
parent: john at arbash-meinel.com-20060126174424-4825872c449513b1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-01-26 12:33:14 -0600
message:
Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060126174424-4825872c449513b1
parent: john at arbash-meinel.com-20060126174317-da6f057bb33f0d68
parent: john at arbash-meinel.com-20060126172803-a1dfbefffaa899a3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-01-26 11:44:24 -0600
message:
[merge] win32: allow selftest to run without paramiko
------------------------------------------------------------
merged: john at arbash-meinel.com-20060126172803-a1dfbefffaa899a3
parent: john at arbash-meinel.com-20060126151809-9fd33fa77d4a31c5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2006-01-26 11:28:03 -0600
message:
Allow selftest to run, even if we can't load a transport.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060126151809-9fd33fa77d4a31c5
parent: john at arbash-meinel.com-20060124191602-681e9da1f16e695e
parent: robertc at robertcollins.net-20060125055408-decd09a9f3f91658
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-01-26 09:18:09 -0600
message:
[merge] Robert's integration 1453
------------------------------------------------------------
merged: john at arbash-meinel.com-20060126174317-da6f057bb33f0d68
parent: john at arbash-meinel.com-20060126173857-0b2890d871c14b10
parent: john at arbash-meinel.com-20060126151809-9fd33fa77d4a31c5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-01-26 11:43:17 -0600
message:
[merge] jam-integration 1512
------------------------------------------------------------
merged: john at arbash-meinel.com-20060126173857-0b2890d871c14b10
parent: john at arbash-meinel.com-20060126140355-a51a4b80247405f5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-01-26 11:38:57 -0600
message:
Allow bzr selftest --one to continue, even if we have a Skipped test.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060126140355-a51a4b80247405f5
parent: john at arbash-meinel.com-20060125184821-ed0f851ed35317eb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-01-26 08:03:55 -0600
message:
Giving nicer warning when there is a leftover xml.pyc file.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060125184821-ed0f851ed35317eb
parent: john at arbash-meinel.com-20060123223323-16eb865383bf650a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2006-01-25 12:48:21 -0600
message:
Fix error when we can't find an editor
------------------------------------------------------------
merged: john at arbash-meinel.com-20060123223323-16eb865383bf650a
parent: john at arbash-meinel.com-20060123223055-43e99c932f0c8945
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Mon 2006-01-23 16:33:23 -0600
message:
From Jari Alto: Makefile fixes (clean target error suppression)
------------------------------------------------------------
merged: john at arbash-meinel.com-20060123223055-43e99c932f0c8945
parent: john at arbash-meinel.com-20060116220752-f88bd067eb868bfb
parent: john at arbash-meinel.com-20060120193409-1466a4908863d28f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Mon 2006-01-23 16:30:55 -0600
message:
[merge] jam-integration
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060130062350-d6f25277ddcdfd79
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
parent: robertc at robertcollins.net-20060129221024-3fb7b838e5cd3e02
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-30 17:23:50 +1100
message:
[merge] robert's integration of much recent work
------------------------------------------------------------
merged: robertc at robertcollins.net-20060129221024-3fb7b838e5cd3e02
parent: robertc at robertcollins.net-20060125055408-decd09a9f3f91658
parent: john at arbash-meinel.com-20060129155904-4f794e2243f81096
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-01-30 09:10:24 +1100
message:
Merge from jam-integration
------------------------------------------------------------
merged: john at arbash-meinel.com-20060129155904-4f794e2243f81096
parent: john at arbash-meinel.com-20060127031448-ac3b2764961ab17c
parent: robertc at robertcollins.net-20060129095252-18f4a192851eb12f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2006-01-29 09:59:04 -0600
message:
[merge] Robert's test-api
------------------------------------------------------------
merged: robertc at robertcollins.net-20060129095252-18f4a192851eb12f
parent: robertc at robertcollins.net-20060112033053-a2113f24c0dc2b01
parent: robertc at robertcollins.net-20060125055408-decd09a9f3f91658
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-apis
timestamp: Sun 2006-01-29 20:52:52 +1100
message:
Merge from mainine.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060112033053-a2113f24c0dc2b01
parent: robertc at robertcollins.net-20060112025928-7ae30672ae84bc0e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-apis
timestamp: Thu 2006-01-12 14:30:53 +1100
message:
Update for integration transport apis.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060112025928-7ae30672ae84bc0e
parent: robertc at robertcollins.net-20051224022045-14efc8dfa0e1a4e9
parent: robertc at robertcollins.net-20060112024225-fe991391e088dd58
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-apis
timestamp: Thu 2006-01-12 13:59:28 +1100
message:
Merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051224022045-14efc8dfa0e1a4e9
parent: robertc at robertcollins.net-20051215083203-07b824bae89674c1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Sat 2005-12-24 13:20:45 +1100
message:
Start tests for api usage.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060127031448-ac3b2764961ab17c
parent: john at arbash-meinel.com-20060126151809-9fd33fa77d4a31c5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-01-26 21:14:48 -0600
message:
[patch] Robey Pointer: squelch the socket.error messages.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060201063713-4cb4d1afcaeba538
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Wed 2006-02-01 17:37:13 +1100
message:
Improved help text for bzr selftest
------------------------------------------------------------
merged: john at arbash-meinel.com-20060201140859-95012ca532c0172b
parent: john at arbash-meinel.com-20060131200102-1cc580967bd9fe7b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-02-01 08:08:59 -0600
message:
Make --no-plugins actually disable plugin loading.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131200102-1cc580967bd9fe7b
parent: john at arbash-meinel.com-20060131155102-e943b3e4b2de830b
parent: john at arbash-meinel.com-20060131140911-3bc59456e076f236
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 14:01:02 -0600
message:
[merge] log reweave errors.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131140911-3bc59456e076f236
parent: john at arbash-meinel.com-20060130010259-39020721b61b67b1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-fix-weave-join
timestamp: Tue 2006-01-31 08:09:11 -0600
message:
When reweaving weaves, if texts don't match, log the differences rather than a plain assert
------------------------------------------------------------
merged: john at arbash-meinel.com-20060130010259-39020721b61b67b1
parent: john at arbash-meinel.com-20060125175627-e27c2a32c0b2bae9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-fix-weave-join
timestamp: Sun 2006-01-29 19:02:59 -0600
message:
cleanups suggested by Robert.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060125175627-e27c2a32c0b2bae9
parent: john at arbash-meinel.com-20060125174402-b190e69756b5a7d7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-fix-weave-join
timestamp: Wed 2006-01-25 11:56:27 -0600
message:
Add progress message to long-running inventory merge, and weave.reweave. Remove copy_to progress from _copy_one, since it only has 1 item to copy
------------------------------------------------------------
merged: john at arbash-meinel.com-20060125174402-b190e69756b5a7d7
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-fix-weave-join
timestamp: Wed 2006-01-25 11:44:02 -0600
message:
Fixing Weave.join() so that it uses the optimized path, and doesn't require Reweave for different parent order or repeated parents.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131155102-e943b3e4b2de830b
parent: john at arbash-meinel.com-20060131153347-6557db0336f7cdf1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 09:51:02 -0600
message:
Minor pep8 cleanups to previous revision
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131153347-6557db0336f7cdf1
parent: john at arbash-meinel.com-20060131145242-c2495bbc9756d9f3
parent: jblack at merconline.com-20060130054458-05b5b89478d482bc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 09:33:47 -0600
message:
[merge] James Blackwell, Hans Ulrich Niedermann: manpage fixes
------------------------------------------------------------
merged: jblack at merconline.com-20060130054458-05b5b89478d482bc
parent: jblack at merconline.com-20060130054213-e0def1bfce8612b8
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-30 00:44:58 -0500
message:
fixed news
------------------------------------------------------------
merged: jblack at merconline.com-20060130054213-e0def1bfce8612b8
parent: jblack at merconline.com-20060130043701-46ceed1e4710a352
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-30 00:42:13 -0500
message:
pep8ifying
------------------------------------------------------------
merged: jblack at merconline.com-20060130043701-46ceed1e4710a352
parent: jblack at merconline.com-20060130042608-b40dc90fc24956e0
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2006-01-29 23:37:01 -0500
message:
Merged mailine
------------------------------------------------------------
merged: jblack at merconline.com-20060130042608-b40dc90fc24956e0
parent: jblack at pluto-20051224124652-834664088ac33b20
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2006-01-29 23:26:08 -0500
message:
Fixed bzr.conf problem
------------------------------------------------------------
merged: jblack at pluto-20051224124652-834664088ac33b20
parent: jblack at pluto-20051224123724-b6110d74176a0442
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sat 2005-12-24 07:46:52 -0500
message:
Added smoke test for doc_generate
------------------------------------------------------------
merged: jblack at pluto-20051224123724-b6110d74176a0442
parent: jblack at pluto-20051212075724-c5cf07c6a7b3e750
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sat 2005-12-24 07:37:24 -0500
message:
Merged from mainline
------------------------------------------------------------
merged: jblack at pluto-20051212075724-c5cf07c6a7b3e750
parent: jblack at pluto-20051212033802-fc9c7272281121c9
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 02:57:24 -0500
message:
Fix up setup.py to call the manpage generation
------------------------------------------------------------
merged: jblack at pluto-20051212033802-fc9c7272281121c9
parent: jblack at pluto-20051212021621-a3151675c1f8a9c9
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 22:38:02 -0500
message:
NEWS file
------------------------------------------------------------
merged: jblack at pluto-20051212021621-a3151675c1f8a9c9
parent: jblack at pluto-20051212021126-a7ffba4393d3a9eb
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 21:16:21 -0500
message:
Fixing docstring for bzrhelp
------------------------------------------------------------
merged: jblack at pluto-20051212021126-a7ffba4393d3a9eb
parent: jblack at pluto-20051212012915-9b0caaaf70aeffe3
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 21:11:26 -0500
message:
Final tuning
------------------------------------------------------------
merged: jblack at pluto-20051212012915-9b0caaaf70aeffe3
parent: jblack at pluto-20051212012627-a5637b074fce751b
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 20:29:15 -0500
message:
needed __init__ in tools
------------------------------------------------------------
merged: jblack at pluto-20051212012627-a5637b074fce751b
parent: jblack at pluto-20051212010719-31777648cf2e762f
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 20:26:27 -0500
message:
Final wrapup on doc generation
------------------------------------------------------------
merged: jblack at pluto-20051212010719-31777648cf2e762f
parent: jblack at pluto-20051212003421-e2aa1fe9efd780ac
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 20:07:19 -0500
message:
Better help for doc_generate
------------------------------------------------------------
merged: jblack at pluto-20051212003421-e2aa1fe9efd780ac
parent: jblack at pluto-20051212001509-a28b6c6e9618d973
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 19:34:21 -0500
message:
Updating plan
------------------------------------------------------------
merged: jblack at pluto-20051212001509-a28b6c6e9618d973
parent: jblack at pluto-20051212000725-762c2850e04f38ca
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 19:15:09 -0500
message:
Fixing up autodoc
------------------------------------------------------------
merged: jblack at pluto-20051212000725-762c2850e04f38ca
parent: jblack at pluto-20051211235309-bbaa35713c759536
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 19:07:25 -0500
message:
Going closer to ndim
------------------------------------------------------------
merged: jblack at pluto-20051211235309-bbaa35713c759536
parent: jblack at pluto-20051211233848-1fea0a14c5c8fd59
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 18:53:09 -0500
message:
Hacked up ndim's code
------------------------------------------------------------
merged: jblack at pluto-20051211233848-1fea0a14c5c8fd59
parent: jblack at pluto-20051210014156-319193e3647d916e
parent: hun at n-dimensional.de-20051211231127-442e97a4dcd3533f
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 18:38:48 -0500
message:
- Pulling generated docs into one place, though whether bash completion is
documents is arguable....
- Bash completion generator. [Hans Ulrich Niedermann]
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211231127-442e97a4dcd3533f
parent: hun at n-dimensional.de-20051211230421-3e5789fc1fa93ead
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: ndim's improvements over jblack's bzr_man.py simplification
timestamp: Mon 2005-12-12 00:11:27 +0100
message:
more bzr-infogen docs
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211230421-3e5789fc1fa93ead
parent: hun at n-dimensional.de-20051211230150-77dc6510d8613f5f
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: ndim's improvements over jblack's bzr_man.py simplification
timestamp: Mon 2005-12-12 00:04:21 +0100
message:
rename bzr-infogen.py option -f to more standard-like -o
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211230150-77dc6510d8613f5f
parent: hun at n-dimensional.de-20051211224659-0f055c115c4dd309
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: ndim's improvements over jblack's bzr_man.py simplification
timestamp: Mon 2005-12-12 00:01:50 +0100
message:
bzr-infogen.py cosmetics
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211224659-0f055c115c4dd309
parent: hun at n-dimensional.de-20051211224136-a15b0e4b1212c520
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: bzr-help-ndim
timestamp: Sun 2005-12-11 23:46:59 +0100
message:
Implement the bzr documentation/information autogeneration plan:
* Add bzr-infogen.py script.
* Moved main() from bzrinfogen/__init__py to bzr-infogen.py where it belongs
Still missing:
* test case for autogeneration
* actual implementation of bash completion script
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211224136-a15b0e4b1212c520
parent: hun at n-dimensional.de-20051210183215-f3ee423778e7ea06
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: bzr-help-ndim
timestamp: Sun 2005-12-11 23:41:36 +0100
message:
Implement the bzr documentation/information autogeneration plan:
* Add new module bzrinfogen.
* Add bzrinfogen/__init__py which implements the infogen infrastructure.
* Add bzrinfogen/big_bash_completion.py:
Generates (unusable prototype) bash completion script from internal
information on bzr commands and options
* Moved bzr_man.py to bzrinfogen/big_man.py and ported it to the new
interface.
Still missing:
* test case for autogeneration
* actual implementation of bash completion script
------------------------------------------------------------
merged: hun at n-dimensional.de-20051210183215-f3ee423778e7ea06
parent: hun at n-dimensional.de-20051210171004-b0abbc0256065eed
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: bzr-help-ndim
timestamp: Sat 2005-12-10 19:32:15 +0100
message:
baz_man.py: factor out command list generation; add TODO list
------------------------------------------------------------
merged: hun at n-dimensional.de-20051210171004-b0abbc0256065eed
parent: jblack at pluto-20051210014156-319193e3647d916e
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: bzr-help-ndim
timestamp: Sat 2005-12-10 18:10:04 +0100
message:
Start implementing general doc generation plan:
* describe the plan
* steal some code from bzrlib.help to extract command help
* use subsections for each bzr command
* add COMMAND OVERVIEW section
* add USAGE section with a few common use cases
* remove copyright marks as I am going to sign over copyright to Canonical
------------------------------------------------------------
merged: jblack at pluto-20051210014156-319193e3647d916e
parent: jblack at pluto-20051210013541-4b1bfd42eb42584b
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 20:41:56 -0500
message:
Minor fixes to tutorial
------------------------------------------------------------
merged: jblack at pluto-20051210013541-4b1bfd42eb42584b
parent: jblack at pluto-20051210012930-d3fce189273c9fa6
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 20:35:41 -0500
message:
Fixing NEWS
------------------------------------------------------------
merged: jblack at pluto-20051210012930-d3fce189273c9fa6
parent: jblack at pluto-20051210000050-f24530fd02918c61
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 20:29:30 -0500
message:
Give long help with command on man page
------------------------------------------------------------
merged: jblack at pluto-20051210000050-f24530fd02918c61
parent: jblack at pluto-20051209234840-9f00d87c354b5c7b
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 19:00:50 -0500
message:
Marked which parts of file is owned by Hans
------------------------------------------------------------
merged: jblack at pluto-20051209234840-9f00d87c354b5c7b
parent: jblack at pluto-20051209234750-184fa848e8023670
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 18:48:40 -0500
message:
man_page.py, Canonical Ltd., not Canonical
------------------------------------------------------------
merged: jblack at pluto-20051209234750-184fa848e8023670
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
parent: hun at n-dimensional.de-20051209214826-c763355e488d6b32
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 18:47:50 -0500
message:
Update for .bazaar.conf [Hans Ulrich Niedermann]
------------------------------------------------------------
merged: hun at n-dimensional.de-20051209214826-c763355e488d6b32
parent: hun at n-dimensional.de-20051206182459-85151abe047f8e59
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
timestamp: Fri 2005-12-09 22:48:26 +0100
message:
ignore BRANCH-INFO file
------------------------------------------------------------
merged: hun at n-dimensional.de-20051206182459-85151abe047f8e59
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
timestamp: Tue 2005-12-06 19:24:59 +0100
message:
Adapted man page generator and templates to bzr 0.6:
* Added links to the docs at http://bazaar.canonical.com/
* Document ~/.bazaar/* instead of ~/.bzr.conf/*
* Document BZR_HOME variable
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131145242-c2495bbc9756d9f3
parent: john at arbash-meinel.com-20060131144844-73cc30d65de20db5
parent: Matthieu.Moy at imag.fr-20060131132251-22fb294ef6a8e1b1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 08:52:42 -0600
message:
[merge] Matthieu Moy & Daniel Silverstone, ftp fixes
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060131132251-22fb294ef6a8e1b1
parent: Matthieu.Moy at imag.fr-20060131114527-863611ab7b8a0b3f
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Tue 2006-01-31 14:22:51 +0100
message:
Credit myself in NEWS. Mentionned FTP connections reuse.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060131114527-863611ab7b8a0b3f
parent: Matthieu.Moy at imag.fr-20060131092814-3b09f3122a0e0308
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Tue 2006-01-31 12:45:27 +0100
message:
Updated the NEWS file
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060131092814-3b09f3122a0e0308
parent: Matthieu.Moy at imag.fr-20060131090300-3844a0f05fc99736
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Tue 2006-01-31 10:28:14 +0100
message:
Raise NoSuchFile in stat when this is the case
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060131090300-3844a0f05fc99736
parent: Matthieu.Moy at imag.fr-20060130190238-e55cacdc28eab6bd
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Tue 2006-01-31 10:03:00 +0100
message:
better error messages on ftp failures
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130190238-e55cacdc28eab6bd
parent: Matthieu.Moy at imag.fr-20060130190156-4a4fd09d31569532
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 20:02:38 +0100
message:
Sleep between retries when the connection closes
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130190156-4a4fd09d31569532
parent: Matthieu.Moy at imag.fr-20060130171033-8eb598010e4850c6
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 20:01:56 +0100
message:
Make ftp put atomic
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130171033-8eb598010e4850c6
parent: Matthieu.Moy at imag.fr-20060130164531-7f10ecf57240aa99
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 18:10:33 +0100
message:
made __number_of_retries global
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130164531-7f10ecf57240aa99
parent: Matthieu.Moy at imag.fr-20060130163816-887c6d44b41ce3be
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 17:45:31 +0100
message:
merge from bzr.dev
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130163816-887c6d44b41ce3be
parent: Matthieu.Moy at imag.fr-20060130064458-ec73d1f3c287df01
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 17:38:16 +0100
message:
One 1 -> _number_of_retries was missing
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130064458-ec73d1f3c287df01
parent: Matthieu.Moy at imag.fr-20060128203303-38a32c095f31c7ad
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 07:44:58 +0100
message:
suggestions by jam and robertc
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060128203303-38a32c095f31c7ad
parent: dsilvers at digital-scurf.org-20060112121704-cc3026dbfc1dc6a6
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Sat 2006-01-28 21:33:03 +0100
message:
try to solve the problem of ftp servers closing the connection
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20060112121704-cc3026dbfc1dc6a6
parent: dsilvers at digital-scurf.org-20060110163059-0f4ec1fab71127ba
parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Thu 2006-01-12 12:17:04 +0000
message:
Merge from Martin
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20060110163059-0f4ec1fab71127ba
parent: dsilvers at digital-scurf.org-20060109105147-17dd71ee850f7a60
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Tue 2006-01-10 16:30:59 +0000
message:
Add a NEWS item about bzr missing
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20060109105147-17dd71ee850f7a60
parent: dsilvers at digital-scurf.org-20051212125410-d41faeac886c1187
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Mon 2006-01-09 10:51:47 +0000
message:
Merge from martin
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051212125410-d41faeac886c1187
parent: dsilvers at digital-scurf.org-20051206142634-86cd90cf8ae4fa08
parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Mon 2005-12-12 12:54:10 +0000
message:
Merge Martin
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051206142634-86cd90cf8ae4fa08
parent: dsilvers at digital-scurf.org-20051130150710-61c3a2757ed2d37f
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Tue 2005-12-06 14:26:34 +0000
message:
Merge from martin
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051130150710-61c3a2757ed2d37f
parent: dsilvers at digital-scurf.org-20051130150049-9c05b534db8aaed4
parent: abentley at panoramicfeedback.com-20051129211134-2e69b6ad9ef11c85
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Wed 2005-11-30 15:07:10 +0000
message:
Merge in aaron's new missing builtin, fix conflict over it in builtins.py
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051130150049-9c05b534db8aaed4
parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
parent: dsilvers at digital-scurf.org-20051117174135-9976b3539124644a
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Wed 2005-11-30 15:00:49 +0000
message:
Merge in ftp.py fixes
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051117174135-9976b3539124644a
parent: dsilvers at digital-scurf.org-20051117174009-85f9b63b34e48bd1
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 17:41:35 +0000
message:
Make sure put raises NoSuchFile on appropriate errors. Also ensure we only ever connect once. Seriously. Really.
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051117174009-85f9b63b34e48bd1
parent: dsilvers at digital-scurf.org-20051116162412-3830d783879122c7
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 17:40:09 +0000
message:
Merge from Martin
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131144844-73cc30d65de20db5
parent: john at arbash-meinel.com-20060131142738-5216651eedf189e1
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 08:48:44 -0600
message:
[merge] bzr.dev which merged jam-pending
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131142738-5216651eedf189e1
parent: john at arbash-meinel.com-20060131142422-000d1398c39fd730
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 08:27:38 -0600
message:
[patch] Dennis Duchier: bzr ancestry post-repository bugfix and test case.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131142422-000d1398c39fd730
parent: john at arbash-meinel.com-20060130011327-f98356c226f92f56
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 08:24:22 -0600
message:
[patch] Aaron Bentley: blackbox test and fix for 'bzr find-merge-base'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060130011327-f98356c226f92f56
parent: john at arbash-meinel.com-20060129155904-4f794e2243f81096
parent: john at arbash-meinel.com-20060130010259-39020721b61b67b1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2006-01-29 19:13:27 -0600
message:
[merge] fix-weave-join
------------------------------------------------------------
merged: robertc at robertcollins.net-20060131044410-50e7a77576907473
parent: robertc at robertcollins.net-20060129221024-3fb7b838e5cd3e02
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-31 15:44:10 +1100
message:
Merge from mainline.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060201232934-8c2e49d220f5a52f
parent: robertc at robertcollins.net-20060201115027-62c24211ee63b688
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Thu 2006-02-02 10:29:34 +1100
message:
add working tree to the BzrDir facilities.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060201115027-62c24211ee63b688
parent: robertc at robertcollins.net-20060131115127-5d5aa204da2b31a2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Wed 2006-02-01 22:50:27 +1100
message:
Branch now uses BzrDir reasonably sanely.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060131115127-5d5aa204da2b31a2
parent: robertc at robertcollins.net-20060131070809-39bb6d774cb93abc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Tue 2006-01-31 22:51:27 +1100
message:
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060131070809-39bb6d774cb93abc
parent: robertc at robertcollins.net-20060130025636-0b9dc25ca69e501a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Tue 2006-01-31 18:08:09 +1100
message:
Basic BzrDir support.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060130025636-0b9dc25ca69e501a
parent: robertc at robertcollins.net-20060130010545-17e73c5d58baccda
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-30 13:56:36 +1100
message:
Start a branch api document.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060130010545-17e73c5d58baccda
parent: robertc at robertcollins.net-20060127080959-8cf1dbe5e2a254e5
parent: robertc at robertcollins.net-20060129221024-3fb7b838e5cd3e02
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-30 12:05:45 +1100
message:
Merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060127080959-8cf1dbe5e2a254e5
parent: robertc at robertcollins.net-20060127052812-bb60c863088c4141
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 19:09:59 +1100
message:
Finish deprecating Branch.working_tree()
------------------------------------------------------------
merged: robertc at robertcollins.net-20060127052812-bb60c863088c4141
parent: robertc at robertcollins.net-20060126231725-be1d4faaac4298db
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 16:28:12 +1100
message:
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
------------------------------------------------------------
merged: robertc at robertcollins.net-20060126231725-be1d4faaac4298db
parent: robertc at robertcollins.net-20060126224318-282ad27f4c81da2a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 10:17:25 +1100
message:
Fix remaining uses of deprecated apis within bzrlib.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060126224318-282ad27f4c81da2a
parent: robertc at robertcollins.net-20060126223910-4500ee14cdc22d64
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 09:43:18 +1100
message:
remove done TODO.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060110105314-c7cb6a57c52477bd
parent: robertc at robertcollins.net-20060110094553-4be9f3f7c641d03b
parent: robertc at robertcollins.net-20060110062704-bf190acccbdc2457
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Tue 2006-01-10 21:53:14 +1100
message:
Merge from test-providers.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060110094553-4be9f3f7c641d03b
parent: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
parent: robertc at robertcollins.net-20060109051935-ee3847274413fe22
committer: Robert Collins <robertc at robertcollins.net>
branch nick: checkout
timestamp: Tue 2006-01-10 20:45:53 +1100
message:
Merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060214064406-f4e4db1399d7069d
parent: robertc at robertcollins.net-20060213231929-686f2e0d9859cd83
parent: robertc at robertcollins.net-20060213235519-8d0ee14d761be81b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-02-14 17:44:06 +1100
message:
Merge in bzr-dir phase 2.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213235519-8d0ee14d761be81b
parent: robertc at robertcollins.net-20060212205854-5bd98a23ff8314f4
parent: robertc at robertcollins.net-20060213231929-686f2e0d9859cd83
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Tue 2006-02-14 10:55:19 +1100
message:
Merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060213231929-686f2e0d9859cd83
parent: robertc at robertcollins.net-20060201211329-b3faf2a411316ff7
parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-02-14 10:19:29 +1100
message:
Merge from jam-integration.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
parent: john at arbash-meinel.com-20060212224633-beec76e4ced17f96
parent: abentley at panoramicfeedback.com-20060213194322-559e96ff793e0682
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2006-02-13 15:40:27 -0600
message:
[merge] bzr.ab, several small bugfixes.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213194322-559e96ff793e0682
parent: abentley at panoramicfeedback.com-20060213194138-2a339f4efb33c673
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab2
timestamp: Mon 2006-02-13 14:43:22 -0500
message:
Test case for discrepancy between fileid_involved and compare_tree [recommit]
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213194138-2a339f4efb33c673
parent: abentley at panoramicfeedback.com-20060213193541-bc073c45969f80ff
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab2
timestamp: Mon 2006-02-13 14:41:38 -0500
message:
Restored blackbox tests [recommit]
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213193541-bc073c45969f80ff
parent: abentley at panoramicfeedback.com-20060213193447-6437ea35f5949df1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab2
timestamp: Mon 2006-02-13 14:35:41 -0500
message:
Removed more selftest spam [recommit]
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213193447-6437ea35f5949df1
parent: abentley at panoramicfeedback.com-20060213192244-b3bc3d4d0a53578d
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab2
timestamp: Mon 2006-02-13 14:34:47 -0500
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213192244-b3bc3d4d0a53578d
parent: abentley at panoramicfeedback.com-20060213191949-bd6946ac59e19a25
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab2
timestamp: Mon 2006-02-13 14:22:44 -0500
message:
Removed lock-related log spam [recommit]
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213191949-bd6946ac59e19a25
parent: abentley at panoramicfeedback.com-20060213191854-d7525def24951995
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab2
timestamp: Mon 2006-02-13 14:19:49 -0500
message:
Fix find-merge-base for new API [recommit]
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213191854-d7525def24951995
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab2
timestamp: Mon 2006-02-13 14:18:54 -0500
message:
recommit 1527 PEP8 fixes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060212224633-beec76e4ced17f96
parent: john at arbash-meinel.com-20060206140209-793eeeb7f3f3d069
parent: john at arbash-meinel.com-20060212193502-9c9da50d8ad48492
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2006-02-12 16:46:33 -0600
message:
[merge] fix weave join to display nicer progress messages.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060212193502-9c9da50d8ad48492
parent: john at arbash-meinel.com-20060206140209-793eeeb7f3f3d069
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-fix-weave-join
timestamp: Sun 2006-02-12 13:35:02 -0600
message:
Simplifying what bzr displays when merging
------------------------------------------------------------
merged: john at arbash-meinel.com-20060206140209-793eeeb7f3f3d069
parent: john at arbash-meinel.com-20060206135424-e20c6607c047b096
parent: erik at bagfors.nu-20060206083239-535fbe376baa4886
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2006-02-06 08:02:09 -0600
message:
[merge] Erik BÃ¥gfors: add --revision to bzr pull
------------------------------------------------------------
merged: erik at bagfors.nu-20060206083239-535fbe376baa4886
parent: erik at bagfors.nu-20060204193826-faeadb63784b823f
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: Erik BÃ¥gfors' pull --revision branch
timestamp: Mon 2006-02-06 09:32:39 +0100
message:
update NEWS
------------------------------------------------------------
merged: erik at bagfors.nu-20060204193826-faeadb63784b823f
parent: erik at bagfors.nu-20060117114403-1f884dcb91d93eb3
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: Erik BÃ¥gfors' pull --revision branch
timestamp: Sat 2006-02-04 20:38:26 +0100
message:
merge from bzr.dev
------------------------------------------------------------
merged: erik at bagfors.nu-20060117114403-1f884dcb91d93eb3
parent: erik at bagfors.nu-20060103093307-685b7da2a2b96a39
parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: Erik BÃ¥gfors' pull --revision branch
timestamp: Tue 2006-01-17 12:44:03 +0100
message:
merge from bzr.dev
------------------------------------------------------------
merged: erik at bagfors.nu-20060103093307-685b7da2a2b96a39
parent: erik at bagfors.nu-20060103092351-ca586a459c94e253
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: Erik BÃ¥gfors' pull --revision branch
timestamp: Tue 2006-01-03 10:33:07 +0100
message:
better way to get to the rev_id
------------------------------------------------------------
merged: erik at bagfors.nu-20060103092351-ca586a459c94e253
parent: erik at bagfors.nu-20051224220300-c5c1a259d3bafb7b
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: Erik BÃ¥gfors' pull --revision branch
timestamp: Tue 2006-01-03 10:23:51 +0100
message:
expanded tabs
------------------------------------------------------------
merged: erik at bagfors.nu-20051224220300-c5c1a259d3bafb7b
parent: erik at bagfors.nu-20051223235548-57d23cf4d5d15ec3
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: Erik BÃ¥gfors' pull --revision branch
timestamp: Sat 2005-12-24 23:03:00 +0100
message:
changes for pull --revision based on input from John
------------------------------------------------------------
merged: erik at bagfors.nu-20051223235548-57d23cf4d5d15ec3
parent: erik at bagfors.nu-20051220112436-0c74ef0e272fe074
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: Erik BÃ¥gfors' pull --revision branch
timestamp: Sat 2005-12-24 00:55:48 +0100
message:
test for pull --revision
------------------------------------------------------------
merged: erik at bagfors.nu-20051220112436-0c74ef0e272fe074
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: Erik BÃ¥gfors' pull --revision branch
timestamp: Tue 2005-12-20 12:24:36 +0100
message:
Support for --revision in pull
------------------------------------------------------------
merged: john at arbash-meinel.com-20060206135424-e20c6607c047b096
parent: john at arbash-meinel.com-20060204235841-23632e02a5097602
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2006-02-06 07:54:24 -0600
message:
Fix blackbox tests so they run again, and they load tests before loading the test suite, so you get proper errors.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060204235841-23632e02a5097602
parent: john at arbash-meinel.com-20060204234145-4fcfb3fdd2c081e6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sat 2006-02-04 17:58:41 -0600
message:
Found a bug in my test_status.py cleanup
------------------------------------------------------------
merged: john at arbash-meinel.com-20060204234145-4fcfb3fdd2c081e6
parent: john at arbash-meinel.com-20060204233046-72d1d7f41dd71180
parent: robey at master-shake.local-20060117004349-64415dc6bbf883f8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sat 2006-02-04 17:41:45 -0600
message:
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
------------------------------------------------------------
merged: robey at master-shake.local-20060117004349-64415dc6bbf883f8
parent: robey at master-shake.local-20060116074642-3fea2503c99075a2
parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.robey
timestamp: Mon 2006-01-16 16:43:49 -0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at master-shake.local-20060116074642-3fea2503c99075a2
parent: robey at master-shake.local-20060112090306-c25120c9586b2067
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.robey
timestamp: Sun 2006-01-15 23:46:42 -0800
message:
add --lsprof-file option to specify a file for writing lsprof data to (instead of dumping a pretty-print to the terminal)
------------------------------------------------------------
merged: robey at master-shake.local-20060112090306-c25120c9586b2067
parent: robey at master-shake.local-20060112073010-69b685c95ac1628d
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.robey
timestamp: Thu 2006-01-12 01:03:06 -0800
message:
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
------------------------------------------------------------
merged: robey at master-shake.local-20060112073010-69b685c95ac1628d
parent: robey at master-shake.local-20060112071328-adc900e35a9dd0cd
parent: mbp at sourcefrog.net-20060112045444-cc2e49b5bae40e06
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.robey
timestamp: Wed 2006-01-11 23:30:10 -0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: robey at master-shake.local-20060112071328-adc900e35a9dd0cd
parent: robey at master-shake.local-20060111071938-f725715d3e0f097e
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.robey
timestamp: Wed 2006-01-11 23:13:28 -0800
message:
patch from robert collins to simplify the paramiko version test
------------------------------------------------------------
merged: robey at master-shake.local-20060111071938-f725715d3e0f097e
parent: robey at master-shake.local-20060109074939-325c56daf5ee2491
committer: Robey Pointer <robey at master-shake.local>
branch nick: bzr.robey
timestamp: Tue 2006-01-10 23:19:38 -0800
message:
move the paramiko version check up to the top and use getattr instead of hasattr. use BZR_SSH instead of BZR_USE_PARAMIKO, to allow overriding the ssh vendor check in a general way.
------------------------------------------------------------
merged: robey at master-shake.local-20060109074939-325c56daf5ee2491
parent: robey at master-shake.local-20060109074633-85245a191c3b8ca7
committer: Röbey Pointer <robey at master-shake.local>
branch nick: bzr.robey
timestamp: Sun 2006-01-08 23:49:39 -0800
message:
allow forcing the use of paramiko via environ var; use prefetch on paramiko >= 1.5.2
------------------------------------------------------------
merged: robey at master-shake.local-20060109074633-85245a191c3b8ca7
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Röbey Pointer <robey at master-shake.local>
branch nick: bzr.robey
timestamp: Sun 2006-01-08 23:46:33 -0800
message:
change http url parsing to use urlparse, and use the ui_factory to ask for a password if necessary
------------------------------------------------------------
merged: john at arbash-meinel.com-20060204233046-72d1d7f41dd71180
parent: john at arbash-meinel.com-20060201141338-d211b93a6adfa691
parent: james.henstridge at canonical.com-20060202091151-fb40d3f83952167e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sat 2006-02-04 17:30:46 -0600
message:
[merge] James Henstridge: Set user agent for http
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060202091151-fb40d3f83952167e
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-02-02 17:11:51 +0800
message:
Set the user agent when grabbing files via http.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060212205854-5bd98a23ff8314f4
parent: robertc at robertcollins.net-20060210125339-a4c03f338943ed71
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr-dir
timestamp: Mon 2006-02-13 07:58:54 +1100
message:
Review feedback from John Meinel.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060210125339-a4c03f338943ed71
parent: robertc at robertcollins.net-20060210123118-b4edbe22441ec029
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2006-02-10 23:53:39 +1100
message:
update BRANCH.TODO
------------------------------------------------------------
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: pqm at pqm.ubuntu.com-20060219235508-029a9d591a35f189
parent: pqm at pqm.ubuntu.com-20060218023347-0952c65f668bfd68
parent: robertc at robertcollins.net-20060219234731-4f361d82e113cbb0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-02-19 23:55:08 +0000
message:
Remove unused patches/ directory.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060219234731-4f361d82e113cbb0
parent: robertc at robertcollins.net-20060218005717-348c76bf711254a5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-02-20 10:47:31 +1100
message:
Remove unused patches/ directory.
------------------------------------------------------------
merged: 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.
------------------------------------------------------------
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-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.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060217044707-8c15dab107f79a40
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
parent: john at arbash-meinel.com-20060217035556-b86991407ef095d9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-02-17 15:47:07 +1100
message:
Merge jam-integration.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060217035556-b86991407ef095d9
parent: john at arbash-meinel.com-20060217024753-edfa0e845eed8993
parent: john at arbash-meinel.com-20060217020102-a26538d2b32bff80
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 21:55:56 -0600
message:
[merge] jam-pending: add sign-my-commits, fix repository.clone, add progress bars.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060217020102-a26538d2b32bff80
parent: john at arbash-meinel.com-20060216171015-1c017977993fbe9b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-02-16 20:01:02 -0600
message:
cleanups from Robert
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216171015-1c017977993fbe9b
parent: john at arbash-meinel.com-20060216170909-155c5aa4a20620dc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-02-16 11:10:15 -0600
message:
Adding progress bars to copy_all and copy_multi, fixing ordering of repository.clone() to pull inventories after weaves.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216170909-155c5aa4a20620dc
parent: john at arbash-meinel.com-20060216170234-28b00293a6fdb5bf
parent: john at arbash-meinel.com-20060215223111-db659aff6ab35804
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Thu 2006-02-16 11:09:09 -0600
message:
[merge] bump up sign-my-commits
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215223111-db659aff6ab35804
parent: john at arbash-meinel.com-20060215154209-1db9dff063341810
parent: john at arbash-meinel.com-20060215220155-08afc2aced7548dc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2006-02-15 16:31:11 -0600
message:
[merge] jam-integration, along with BzrDir changes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215220155-08afc2aced7548dc
parent: john at arbash-meinel.com-20060214181443-42056ee264cc28fe
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-02-15 16:01:55 -0600
message:
[merge] robertc's integration branch: add BzrDir, and checkouts
------------------------------------------------------------
merged: john at arbash-meinel.com-20060214181443-42056ee264cc28fe
parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
parent: john at arbash-meinel.com-20060214170602-5959f911674708c9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-02-14 12:14:43 -0600
message:
[merge] jam-pending: allow bzr re-sign to take multiple arguments
------------------------------------------------------------
merged: john at arbash-meinel.com-20060214170602-5959f911674708c9
parent: john at arbash-meinel.com-20060214170148-2765fe23e7309b93
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-02-14 11:06:02 -0600
message:
Updated NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060214170148-2765fe23e7309b93
parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-02-14 11:01:48 -0600
message:
Updating bzr re-sign to allow multiple arguments, and updating tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215154209-1db9dff063341810
parent: john at arbash-meinel.com-20060215153329-5d70f0eda01f5cfe
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2006-02-15 09:42:09 -0600
message:
Adding sign-my-commits as a builtin, along with some simple tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215153329-5d70f0eda01f5cfe
parent: john at arbash-meinel.com-20060215151844-ce3e3efccd19da3f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2006-02-15 09:33:29 -0600
message:
Fix doc bug
------------------------------------------------------------
merged: john at arbash-meinel.com-20060215151844-ce3e3efccd19da3f
parent: john at arbash-meinel.com-20060214183630-bf533b848ea5edce
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2006-02-15 09:18:44 -0600
message:
Reverting gpg changes, should not be mainline, see gpg_uses_tempfile plugin.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060214183630-bf533b848ea5edce
parent: john at arbash-meinel.com-20060214170602-5959f911674708c9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-02-14 12:36:30 -0600
message:
Updated gpg to use a named file, rather than using stdin, so that gpg-agent will work properly
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216170234-28b00293a6fdb5bf
parent: john at arbash-meinel.com-20060216164908-3b469d969279998a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 11:02:34 -0600
message:
small cleanup of test
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216164908-3b469d969279998a
parent: john at arbash-meinel.com-20060216164307-5a0d008322cbf1d8
parent: marienz at gentoo.org-20060213232429-dd6f4ee24918e675
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 10:49:08 -0600
message:
[merge] Marien Zwart: make testament actually support unicode strings.
------------------------------------------------------------
merged: marienz at gentoo.org-20060213232429-dd6f4ee24918e675
parent: marienz at gentoo.org-20060212234125-9d198c5d818af110
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Tue 2006-02-14 00:24:29 +0100
message:
Move the encoding step into the test to make it more obvious we are comparing bytestrings.
------------------------------------------------------------
merged: marienz at gentoo.org-20060212234125-9d198c5d818af110
parent: marienz at gentoo.org-20060212224024-782d3bcc922d980c
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Mon 2006-02-13 00:41:25 +0100
message:
Whitespace cleanup (pep 3)
------------------------------------------------------------
merged: marienz at gentoo.org-20060212224024-782d3bcc922d980c
parent: marienz at gentoo.org-20060212223951-4827a2850a0da0e6
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Sun 2006-02-12 23:40:24 +0100
message:
Remove a useless local function.
------------------------------------------------------------
merged: marienz at gentoo.org-20060212223951-4827a2850a0da0e6
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Sun 2006-02-12 23:39:51 +0100
message:
Make Testament.as_text_lines return utf-8 instead of unicode objects and add a test for this.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060216164307-5a0d008322cbf1d8
parent: john at arbash-meinel.com-20060215220155-08afc2aced7548dc
parent: erik at bagfors.nu-20060216104622-46a6394829db2ee8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 10:43:07 -0600
message:
[merge] bzr.log.plugins: add --log-format to 'bzr log', allow a default to be set in config
------------------------------------------------------------
merged: erik at bagfors.nu-20060216104622-46a6394829db2ee8
parent: erik at bagfors.nu-20060216104544-42f90be7bc2e5856
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Thu 2006-02-16 11:46:22 +0100
message:
reformat NEWS
------------------------------------------------------------
merged: erik at bagfors.nu-20060216104544-42f90be7bc2e5856
parent: erik at bagfors.nu-20060216104359-444d0956bed3a1f7
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Thu 2006-02-16 11:45:44 +0100
message:
bugfix, typo bug
------------------------------------------------------------
merged: erik at bagfors.nu-20060216104359-444d0956bed3a1f7
parent: erik at bagfors.nu-20060215204913-66b12988b85e0b57
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Thu 2006-02-16 11:43:59 +0100
message:
blackbox tests for default log format and log-format arguments
------------------------------------------------------------
merged: erik at bagfors.nu-20060215204913-66b12988b85e0b57
parent: erik at bagfors.nu-20060210212329-0b949820c96ebe15
parent: john at arbash-meinel.com-20060213214027-f87283ba0fa50538
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Wed 2006-02-15 21:49:13 +0100
message:
[merge] jam-integration
------------------------------------------------------------
merged: erik at bagfors.nu-20060210212329-0b949820c96ebe15
parent: erik at bagfors.nu-20060206201243-3f60d7473fcf9ef3
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Fri 2006-02-10 22:23:29 +0100
message:
log_formatter => log_format for "named" formatters
The name of a formatter is now called log_format and is exposed
as "log-format" and not "log-formatter" to the user for more consitency
------------------------------------------------------------
merged: erik at bagfors.nu-20060206201243-3f60d7473fcf9ef3
parent: erik at bagfors.nu-20060206201150-73d89be9e6320dad
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Mon 2006-02-06 21:12:43 +0100
message:
tests for config log_formatter
------------------------------------------------------------
merged: erik at bagfors.nu-20060206201150-73d89be9e6320dad
parent: erik at bagfors.nu-20060204115126-c9ee420cc8876c25
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Mon 2006-02-06 21:11:50 +0100
message:
fix in help, log_format -> log_formatter
------------------------------------------------------------
merged: erik at bagfors.nu-20060204115126-c9ee420cc8876c25
parent: erik at bagfors.nu-20060204114014-ef72c583019c8342
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Sat 2006-02-04 12:51:26 +0100
message:
Make default formatter work for the missing command
Also, removed debugging
------------------------------------------------------------
merged: erik at bagfors.nu-20060204114014-ef72c583019c8342
parent: erik at bagfors.nu-20060204113623-016da21eeb5723ca
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Sat 2006-02-04 12:40:14 +0100
message:
update NEWS
------------------------------------------------------------
merged: erik at bagfors.nu-20060204113623-016da21eeb5723ca
parent: erik at bagfors.nu-20060203213448-af43e1511444f3fd
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Sat 2006-02-04 12:36:23 +0100
message:
Support for setting the default log format at a configuration option
Also, removed the possibility for plugins to set the default formatter
------------------------------------------------------------
merged: erik at bagfors.nu-20060203213448-af43e1511444f3fd
parent: erik at bagfors.nu-20060203195457-046f39c916b2ee12
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Fri 2006-02-03 22:34:48 +0100
message:
cover the missing command with formatters as well
------------------------------------------------------------
merged: erik at bagfors.nu-20060203195457-046f39c916b2ee12
parent: erik at bagfors.nu-20060203195059-1cf8ff5aa68de0ea
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Fri 2006-02-03 20:54:57 +0100
message:
Made "unknown log formatter" error message work
------------------------------------------------------------
merged: erik at bagfors.nu-20060203195059-1cf8ff5aa68de0ea
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: Erik BÃ¥gfors <erik at bagfors.nu>
branch nick: bzr.log.plugins
timestamp: Fri 2006-02-03 20:50:59 +0100
message:
Support for plugins to register log formatters and set default formatter
Also, change one command line option for "log"
------------------------------------------------------------
merged: john at arbash-meinel.com-20060217024753-edfa0e845eed8993
parent: john at arbash-meinel.com-20060216170234-28b00293a6fdb5bf
parent: michael at ellerman.id.au-20060216005059-dde4ec75b1b58ebf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2006-02-16 20:47:53 -0600
message:
[merge] Michael Ellerman: support 'bzr log -r ..' and add tests, also clarify 'bzr help --long'
------------------------------------------------------------
merged: michael at ellerman.id.au-20060216005059-dde4ec75b1b58ebf
parent: michael at ellerman.id.au-20060216004340-37abb307ac2b63cf
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Thu 2006-02-16 11:50:59 +1100
message:
Add custom description for help's --long option, this fixes bug #31217.
There were no real tests for help, so add a bunch of black box tests
to confirm all the various incantations work.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060216004340-37abb307ac2b63cf
parent: michael at ellerman.id.au-20060215050736-2b2c17f50a210b4d
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Thu 2006-02-16 11:43:40 +1100
message:
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
it doesn't break in future.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060215050736-2b2c17f50a210b4d
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
parent: john at arbash-meinel.com-20060214181443-42056ee264cc28fe
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: revision-ranges
timestamp: Wed 2006-02-15 16:07:36 +1100
message:
Merge JAM Integration
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060218023347-0952c65f668bfd68
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
parent: robertc at robertcollins.net-20060218005717-348c76bf711254a5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-02-18 02:33:47 +0000
message:
Merge Robert Collins integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221000809-e41f2f69a365093f
parent: robertc at robertcollins.net-20060220230332-29bbe74a3d04c302
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Tue 2006-02-21 11:08:09 +1100
message:
Update NEWS.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220230332-29bbe74a3d04c302
parent: robertc at robertcollins.net-20060220115204-1777ed5964b0cf8d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Tue 2006-02-21 10:03:32 +1100
message:
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220115204-1777ed5964b0cf8d
parent: robertc at robertcollins.net-20060220102233-70839cc4cdbc2011
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 22:52:04 +1100
message:
Move copy_content_into into InterRepository and InterWeaveRepo, and disable the default codepath test as we have optimised paths for all current combinations.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220102233-70839cc4cdbc2011
parent: robertc at robertcollins.net-20060220095027-c52f5024a6f5fcdb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 21:22:33 +1100
message:
Deprecate direct use of fetch.Fetcher.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220095027-c52f5024a6f5fcdb
parent: robertc at robertcollins.net-20060220070554-b738a65e99cd2e9c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 20:50:27 +1100
message:
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220070554-b738a65e99cd2e9c
parent: robertc at robertcollins.net-20060220070110-a49ef22c8ad18929
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 18:05:54 +1100
message:
Test that we get the right optimiser back in the InterRepository tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220070110-a49ef22c8ad18929
parent: robertc at robertcollins.net-20060220052207-3e772753f9599e98
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 18:01:10 +1100
message:
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220052207-3e772753f9599e98
parent: robertc at robertcollins.net-20060220042908-a76ec132a7286899
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 16:22:07 +1100
message:
Allow for optimised InterRepository selection.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220042908-a76ec132a7286899
parent: robertc at robertcollins.net-20060220010359-5475bce47a5ebcd4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 15:29:08 +1100
message:
Start InterRepository with InterRepository.get.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060220010359-5475bce47a5ebcd4
parent: robertc at robertcollins.net-20060219234731-4f361d82e113cbb0
parent: robertc at robertcollins.net-20060220002935-c653f31ef30cadff
committer: Robert Collins <robertc at robertcollins.net>
branch nick: inter-repo-api
timestamp: Mon 2006-02-20 12:03:59 +1100
message:
Merge repository tweaks.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060222054547-70f045f317b7993b
parent: robertc at robertcollins.net-20060221224858-2b61aaa0f1636293
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-02-22 16:45:47 +1100
message:
Fix 'bzr pull' on metadir trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221224858-2b61aaa0f1636293
parent: robertc at robertcollins.net-20060221224144-83aef6ec91b8a5dc
parent: pqm at pqm.ubuntu.com-20060221212748-e81c0691edf46b65
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-02-22 09:48:58 +1100
message:
Merge mainline.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221212748-e81c0691edf46b65
parent: pqm at pqm.ubuntu.com-20060221211130-87707824495dc833
parent: abentley at panoramicfeedback.com-20060221212021-98bc6d0d4a1e7639
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 21:27:48 +0000
message:
Added progress bars to tree-changing operations
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221212021-98bc6d0d4a1e7639
parent: abentley at panoramicfeedback.com-20060221210757-a2967f7c4589d51c
parent: pqm at pqm.ubuntu.com-20060221211130-87707824495dc833
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-02-21 16:20:21 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221211130-87707824495dc833
parent: pqm at pqm.ubuntu.com-20060221174102-aa6bd4464296c614
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 21:11:30 +0000
message:
Added progress bars to tree-changing operations
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221174102-aa6bd4464296c614
parent: pqm at pqm.ubuntu.com-20060221165139-95f219a192c54f27
parent: john at arbash-meinel.com-20060221173608-e169d8586d154050
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 17:41:02 +0000
message:
Mac OSX raises EPERM when you try to unlink a directory
------------------------------------------------------------
merged: john at arbash-meinel.com-20060221173608-e169d8586d154050
parent: john at arbash-meinel.com-20060221164322-b007aa882582a66e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-02-21 11:36:08 -0600
message:
Mac OSX raises EPERM when you try to unlink a directory
------------------------------------------------------------
merged: john at arbash-meinel.com-20060221164322-b007aa882582a66e
parent: john at arbash-meinel.com-20060221050730-ee779d2e776fa5ce
parent: pqm at pqm.ubuntu.com-20060221115154-a1b580a4225d536b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-02-21 10:43:22 -0600
message:
[merge] bzr.dev, cleanup conflicts, fixup http tests for new TestCase layout.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221115154-a1b580a4225d536b
parent: pqm at pqm.ubuntu.com-20060221033439-fcd0849f8070bc8f
parent: robertc at robertcollins.net-20060221114236-0deb1948f0c8c956
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 11:51:54 +0000
message:
Merge in InterRepository API support.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221114236-0deb1948f0c8c956
parent: pqm at pqm.ubuntu.com-20060221033439-fcd0849f8070bc8f
parent: robertc at robertcollins.net-20060221014955-c8bdf2cae88c5e34
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-02-21 22:42:36 +1100
message:
Merge in InterRepository API support.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221033439-fcd0849f8070bc8f
parent: pqm at pqm.ubuntu.com-20060221021734-ccbecdd31223385c
parent: aaron.bentley at utoronto.ca-20060221032904-781ed5b86f2c3b62
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 03:34:39 +0000
message:
Update ConfigObj to 4.2.0
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221032904-781ed5b86f2c3b62
parent: pqm at pqm.ubuntu.com-20060221021734-ccbecdd31223385c
parent: aaron.bentley at utoronto.ca-20060221025734-1359d5ae722a7f81
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Mon 2006-02-20 22:29:04 -0500
message:
Updated ConfigObj to 4.2.0
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221025734-1359d5ae722a7f81
parent: aaron.bentley at utoronto.ca-20060221022630-c74618c305be4ffd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.cobj
timestamp: Mon 2006-02-20 21:57:34 -0500
message:
Fixed get_bool
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221022630-c74618c305be4ffd
parent: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.cobj
timestamp: Mon 2006-02-20 21:26:30 -0500
message:
Switched to ConfigObj 4.2.0
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221021734-ccbecdd31223385c
parent: pqm at pqm.ubuntu.com-20060221011119-9a0c5d37d496d0d7
parent: aaron.bentley at utoronto.ca-20060221012744-0dfd362401335acb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 02:17:34 +0000
message:
Tree Transform-based merger
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221012744-0dfd362401335acb
parent: aaron.bentley at utoronto.ca-20060221012709-c46aaa71a00010e8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-20 20:27:44 -0500
message:
Removed the remains of the old merge code
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221012709-c46aaa71a00010e8
parent: aaron.bentley at utoronto.ca-20060221010533-8682182da8fbcc39
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-20 20:27:09 -0500
message:
Renamed a bunch of functions
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060221010533-8682182da8fbcc39
parent: abentley at panoramicfeedback.com-20060217155604-fb8049ff5cf2f714
parent: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-20 20:05:33 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217155604-fb8049ff5cf2f714
parent: abentley at panoramicfeedback.com-20060217145536-47acd73ee3dad3b4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 10:56:04 -0500
message:
Added Transform docs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217145536-47acd73ee3dad3b4
parent: abentley at panoramicfeedback.com-20060217135725-1aa269dda84d7f46
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 09:55:36 -0500
message:
Fixed dangling inventory ids in revert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217135725-1aa269dda84d7f46
parent: abentley at lappy-20060217125306-89e0b981e673e3c6
parent: robertc at robertcollins.net-20060217044707-8c15dab107f79a40
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 08:57:25 -0500
message:
Merge Robert (who merged John)
------------------------------------------------------------
merged: abentley at lappy-20060217125306-89e0b981e673e3c6
parent: aaron.bentley at utoronto.ca-20060217061404-f675a79b56425055
committer: abentley <abentley at lappy>
branch nick: bzr.ttransform
timestamp: Fri 2006-02-17 07:53:06 -0500
message:
Fixed up tests for Windows
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060217061404-f675a79b56425055
parent: aaron.bentley at utoronto.ca-20060217055941-fb55c4bbd3cecbb7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 01:14:04 -0500
message:
Ensured revert writes a normal inventory
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060217055941-fb55c4bbd3cecbb7
parent: aaron.bentley at utoronto.ca-20060217050904-798560096c2d93bd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 00:59:41 -0500
message:
Updated NEWS re Tree Transform
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060217050904-798560096c2d93bd
parent: abentley at panoramicfeedback.com-20060216161825-6bad50573bfd84a2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 00:09:04 -0500
message:
Added conflict warnings to revert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060216161825-6bad50573bfd84a2
parent: abentley at panoramicfeedback.com-20060216160746-4dad42ceb716248a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-16 11:18:25 -0500
message:
Integrated fs conflicts with merge conflicts.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060216160746-4dad42ceb716248a
parent: abentley at panoramicfeedback.com-20060216153036-e293ffc1ab833fd5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-16 11:07:46 -0500
message:
Implemented stringifying filesystem conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060216153036-e293ffc1ab833fd5
parent: abentley at panoramicfeedback.com-20060215223801-481098c6196185c0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-16 10:30:36 -0500
message:
Cleaned up filesystem conflict handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060215223801-481098c6196185c0
parent: abentley at panoramicfeedback.com-20060215195546-a59a138c9a76a80f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-15 17:38:01 -0500
message:
Add filesystem/inventory conflicts to conflict output
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060215195546-a59a138c9a76a80f
parent: abentley at panoramicfeedback.com-20060215195121-1dc2ffae14bf92d2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-15 14:55:46 -0500
message:
Removed unused function
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060215195121-1dc2ffae14bf92d2
parent: abentley at panoramicfeedback.com-20060215193857-d82b04a2abf75b2d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-15 14:51:21 -0500
message:
PEP8 and comment cleanups
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060215193857-d82b04a2abf75b2d
parent: abentley at panoramicfeedback.com-20060215144326-7d51e454c3ed48a5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-15 14:38:57 -0500
message:
Swapped os.path.join for pathjoin everywhere
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060215144326-7d51e454c3ed48a5
parent: abentley at panoramicfeedback.com-20060214172326-ec4712d0549ff7cd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-15 09:43:26 -0500
message:
Switched to build_tree instead of revert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060214172326-ec4712d0549ff7cd
parent: abentley at panoramicfeedback.com-20060214171940-c89f22732330f201
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-14 12:23:26 -0500
message:
Updated test to new conflict message
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060214171940-c89f22732330f201
parent: abentley at panoramicfeedback.com-20060213180400-e45681c311dfec35
parent: robertc at robertcollins.net-20060214065221-23180801f3c7cb18
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-14 12:19:40 -0500
message:
Merge from Robert [Fails tests]
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213180400-e45681c311dfec35
parent: abentley at panoramicfeedback.com-20060213173244-b709c2f7bf65cb56
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-13 13:04:00 -0500
message:
Handle failures creating/deleting the Limbo directory
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213173244-b709c2f7bf65cb56
parent: abentley at panoramicfeedback.com-20060213155003-c63f9ddfc82869cb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-13 12:32:44 -0500
message:
Used appropriate control_files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213155003-c63f9ddfc82869cb
parent: abentley at panoramicfeedback.com-20060213154744-fb223e955164940b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-13 10:50:03 -0500
message:
Changed implementation of supports_executable
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060213154744-fb223e955164940b
parent: aaron.bentley at utoronto.ca-20060213012803-0259050f8cc7be16
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-02-13 10:47:44 -0500
message:
Avoided chdir in transform tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060213012803-0259050f8cc7be16
parent: aaron.bentley at utoronto.ca-20060213010930-0dea446b10432af4
parent: john at arbash-meinel.com-20060206140209-793eeeb7f3f3d069
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-02-12 20:28:03 -0500
message:
Merged John Meinel's integration
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060213010930-0dea446b10432af4
parent: aaron.bentley at utoronto.ca-20060213003110-3be4e8d6150d620e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-02-12 20:09:30 -0500
message:
Added more docs
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060213003110-3be4e8d6150d620e
parent: aaron.bentley at utoronto.ca-20060213002436-ca1e5b680fb005cd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-02-12 19:31:10 -0500
message:
PEP8 fixes
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060213002436-ca1e5b680fb005cd
parent: aaron.bentley at utoronto.ca-20060213002115-c110c3bf01415f70
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-02-12 19:24:36 -0500
message:
Removed changes from bzr.ab 1526..1528
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060213002115-c110c3bf01415f70
parent: aaron.bentley at utoronto.ca-20060212005556-98054f6ac4013537
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-02-12 19:21:15 -0500
message:
Removed changes from bzr.ab 1529..1536
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060212005556-98054f6ac4013537
parent: aaron.bentley at utoronto.ca-20060212000651-ebe0326d5a16e10a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-02-11 19:55:56 -0500
message:
Handled test cases involving symlinks
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060212000651-ebe0326d5a16e10a
parent: abentley at panoramicfeedback.com-20060210202529-d946a5230b52bd40
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-02-11 19:06:51 -0500
message:
Fixed overwrites
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210202529-d946a5230b52bd40
parent: abentley at panoramicfeedback.com-20060210201842-cd2cec177a6fa1ee
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 15:25:29 -0500
message:
Fixed all changes applied successfully
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210201842-cd2cec177a6fa1ee
parent: abentley at panoramicfeedback.com-20060210174259-96aac214c15970d2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 15:18:42 -0500
message:
Handled simultaneous renames of parent and child better
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210174259-96aac214c15970d2
parent: abentley at panoramicfeedback.com-20060210172502-29fcb8b0d722ddf9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 12:42:59 -0500
message:
Removed bare except
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210172502-29fcb8b0d722ddf9
parent: abentley at panoramicfeedback.com-20060210164048-f93c8532c2435921
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 12:25:02 -0500
message:
Handled the remaining file versioning case
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210164048-f93c8532c2435921
parent: abentley at panoramicfeedback.com-20060210151724-603e0706e9db2987
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 11:40:48 -0500
message:
Tweak to check inventory, not tree for file ids
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210151724-603e0706e9db2987
parent: abentley at panoramicfeedback.com-20060210144444-5627480f927e57af
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 10:17:24 -0500
message:
Fixed merge so tree root is auto-preserved, not by conflict resolution
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060210144444-5627480f927e57af
parent: aaron.bentley at utoronto.ca-20060210131536-a96eb7d0715c0c41
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-10 09:44:44 -0500
message:
More fixups after get_trans_id
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060210131536-a96eb7d0715c0c41
parent: abentley at panoramicfeedback.com-20060209231130-2ba22e1aa32e38c3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Fri 2006-02-10 08:15:36 -0500
message:
Worked on fixing trans_id stuff
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209231130-2ba22e1aa32e38c3
parent: abentley at panoramicfeedback.com-20060209215658-648bb9372925757b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 18:11:30 -0500
message:
Prevented get_trans_id from automatically versioning file ids
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209215658-648bb9372925757b
parent: abentley at panoramicfeedback.com-20060209215117-812ad6b1215c7d28
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 16:56:58 -0500
message:
Fixed executability conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209215117-812ad6b1215c7d28
parent: abentley at panoramicfeedback.com-20060209210529-6a01be6d2cc0d13b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 16:51:17 -0500
message:
Added conflict reporting
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209210529-6a01be6d2cc0d13b
parent: abentley at panoramicfeedback.com-20060209203923-9014e6d99e7cee61
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 16:05:29 -0500
message:
Moved the merge stuff into merge.py
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209203923-9014e6d99e7cee61
parent: abentley at panoramicfeedback.com-20060209203148-4fc6d4683411a4a7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 15:39:23 -0500
message:
ApplyMerge3 -> Merge3Merger
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209203148-4fc6d4683411a4a7
parent: abentley at panoramicfeedback.com-20060209201225-80e7aad19cfeebc5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 15:31:48 -0500
message:
Removed unused method
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209201225-80e7aad19cfeebc5
parent: abentley at panoramicfeedback.com-20060209194033-ef7305a37596cd72
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 15:12:25 -0500
message:
Avoided generating a new tree for every weave merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209194033-ef7305a37596cd72
parent: abentley at panoramicfeedback.com-20060209180919-08ceeb4e88443274
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 14:40:33 -0500
message:
Got WeaveMerger under test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209180919-08ceeb4e88443274
parent: abentley at panoramicfeedback.com-20060209175041-db781cf66858d891
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 13:09:19 -0500
message:
Fixed deletion handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209175041-db781cf66858d891
parent: abentley at panoramicfeedback.com-20060209174115-37ba422950f6a97f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 12:50:41 -0500
message:
Hid raw conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209174115-37ba422950f6a97f
parent: abentley at panoramicfeedback.com-20060209173921-59e7f1114495d40e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 12:41:15 -0500
message:
Strengthened conflict tests
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060209173921-59e7f1114495d40e
parent: aaron.bentley at utoronto.ca-20060209131613-1a3edd50ed693dc4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-09 12:39:21 -0500
message:
Got cooked conflicts working
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060209131613-1a3edd50ed693dc4
parent: abentley at panoramicfeedback.com-20060208220043-20386bb285886a2c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Thu 2006-02-09 08:16:13 -0500
message:
Work on cooked conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060208220043-20386bb285886a2c
parent: aaron.bentley at utoronto.ca-20060208171612-728e6d1b9438df4b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-08 17:00:43 -0500
message:
More conflict handling, test porting
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060208171612-728e6d1b9438df4b
parent: aaron.bentley at utoronto.ca-20060208033858-46c8840f243241d1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-02-08 12:16:12 -0500
message:
Converted test cases to Tree Transform
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060208033858-46c8840f243241d1
parent: abentley at panoramicfeedback.com-20060207214732-e5afad9e2e0aba1e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform2
timestamp: Tue 2006-02-07 22:38:58 -0500
message:
Got missing contents test working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060207214732-e5afad9e2e0aba1e
parent: abentley at panoramicfeedback.com-20060207192151-f3892d6d1aba2d29
parent: abentley at panoramicfeedback.com-20060207214033-bfeef6ca0e6638a9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-07 16:47:32 -0500
message:
Merge from bzr.ab
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060207214033-bfeef6ca0e6638a9
parent: abentley at panoramicfeedback.com-20060206223923-0726a343d2e9d558
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Tue 2006-02-07 16:40:33 -0500
message:
Merge from Robert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060206223923-0726a343d2e9d558
parent: abentley at panoramicfeedback.com-20060203150941-189c3728c0b3c26a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Mon 2006-02-06 17:39:23 -0500
message:
Test case to show discrepancy between fileid_involved and compare_tree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060203150941-189c3728c0b3c26a
parent: abentley at panoramicfeedback.com-20060203144007-c988a20be3033dff
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Fri 2006-02-03 10:09:41 -0500
message:
Clarified bogus default test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060203144007-c988a20be3033dff
parent: abentley at panoramicfeedback.com-20060203143141-4d10c3b628602301
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Fri 2006-02-03 09:40:07 -0500
message:
Made default options play nice with external commands
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060203143141-4d10c3b628602301
parent: aaron.bentley at utoronto.ca-20060202031253-fa4f98b03e7cb0d8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Fri 2006-02-03 09:31:41 -0500
message:
Restored blackbox tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202031253-fa4f98b03e7cb0d8
parent: aaron.bentley at utoronto.ca-20060202025758-740c20860a1bef14
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-02-01 22:12:53 -0500
message:
Removed more selftest spam
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202025758-740c20860a1bef14
parent: abentley at panoramicfeedback.com-20060201180846-c8f1200d1440c465
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-02-01 21:57:58 -0500
message:
Removed lock-related log spam
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060201180846-c8f1200d1440c465
parent: abentley at panoramicfeedback.com-20060201145539-2b5001f74f213385
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Wed 2006-02-01 13:08:46 -0500
message:
Implemented default command options
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060201145539-2b5001f74f213385
parent: abentley at panoramicfeedback.com-20060130232944-9ae96dc68f219710
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Wed 2006-02-01 09:55:39 -0500
message:
merge from bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060130232944-9ae96dc68f219710
parent: abentley at panoramicfeedback.com-20060130203733-fb122a042b5c6c8a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Mon 2006-01-30 18:29:44 -0500
message:
Fixed find-merge-base for new API
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060130203733-fb122a042b5c6c8a
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ab
timestamp: Mon 2006-01-30 15:37:33 -0500
message:
PEP8 fixes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060207192151-f3892d6d1aba2d29
parent: aaron.bentley at utoronto.ca-20060202044058-9b55a5c8d0cd24ac
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-07 14:21:51 -0500
message:
Fixed executability merge bug
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202044058-9b55a5c8d0cd24ac
parent: aaron.bentley at utoronto.ca-20060202035112-837e9a6992609b16
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-02-01 23:40:58 -0500
message:
Fixed executability merge bug
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202035112-837e9a6992609b16
parent: aaron.bentley at utoronto.ca-20060202034533-3815a958b475d822
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-02-01 22:51:12 -0500
message:
Fixed merge_core bug
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202034533-3815a958b475d822
parent: aaron.bentley at utoronto.ca-20060202032057-f65732829b75feff
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-02-01 22:45:33 -0500
message:
Fixed handling of unversioned files
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202032057-f65732829b75feff
parent: aaron.bentley at utoronto.ca-20060202031124-bdb9bcb9477f4c53
parent: aaron.bentley at utoronto.ca-20060202031253-fa4f98b03e7cb0d8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-02-01 22:20:57 -0500
message:
merge from bzr.ab
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060202031124-bdb9bcb9477f4c53
parent: abentley at panoramicfeedback.com-20060130204015-74e12f8b82cba615
parent: abentley at panoramicfeedback.com-20060201180846-c8f1200d1440c465
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-02-01 22:11:24 -0500
message:
Merge from bzr.ab
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060130204015-74e12f8b82cba615
parent: abentley at panoramicfeedback.com-20060130203853-8e89aae567e9a9a5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-01-30 15:40:15 -0500
message:
PEP8 fixes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060130203853-8e89aae567e9a9a5
parent: abentley at panoramicfeedback.com-20060130184650-a7397ec030158835
parent: abentley at panoramicfeedback.com-20060130203733-fb122a042b5c6c8a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-01-30 15:38:53 -0500
message:
Merged PEP8 fixen
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060130184650-a7397ec030158835
parent: aaron.bentley at utoronto.ca-20060127050018-3af97d0139391a55
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-01-30 13:46:50 -0500
message:
Dirty merge of the mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060127050018-3af97d0139391a55
parent: aaron.bentley at utoronto.ca-20060126130815-8d56cce7b4311f78
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Fri 2006-01-27 00:00:18 -0500
message:
Simplified permission handling of existing files in transform.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060126130815-8d56cce7b4311f78
parent: aaron.bentley at utoronto.ca-20060126004320-33ebc0be567e1963
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Thu 2006-01-26 08:08:15 -0500
message:
Started work on retaining file mode across replacements
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060126004320-33ebc0be567e1963
parent: aaron.bentley at utoronto.ca-20060126004303-76e3fac4fd7a6291
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-25 19:43:20 -0500
message:
Added missing import
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060126004303-76e3fac4fd7a6291
parent: aaron.bentley at utoronto.ca-20060126001012-5ed0d8a9c396b03b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-25 19:43:03 -0500
message:
Added file renaming test case
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060126001012-5ed0d8a9c396b03b
parent: aaron.bentley at utoronto.ca-20060125081243-0af56b5de868b0cc
parent: abentley at panoramicfeedback.com-20060125202003-563fe26e8e1527bb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-25 19:10:12 -0500
message:
Merge my own changes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060125202003-563fe26e8e1527bb
parent: abentley at panoramicfeedback.com-20060125160144-d842bd38b846d915
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-25 15:20:03 -0500
message:
Added Diff3 merging for tree transforms
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060125160144-d842bd38b846d915
parent: abentley at panoramicfeedback.com-20060125155718-469e33b1e04b2b99
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-25 11:01:44 -0500
message:
Implemented weave merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060125155718-469e33b1e04b2b99
parent: abentley at panoramicfeedback.com-20060125070807-49c069660199bb7c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-25 10:57:18 -0500
message:
Reference files in limbo before their creation is finished, for finalize.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060125070807-49c069660199bb7c
parent: abentley at panoramicfeedback.com-20060124210511-71d70f6735edaf7b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-25 02:08:07 -0500
message:
Handled three-way with deletions better
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124210511-71d70f6735edaf7b
parent: abentley at panoramicfeedback.com-20060124205913-7a3cf2fe560f01a7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 16:05:11 -0500
message:
Fixed executability test, so it works with EmptyTree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124205913-7a3cf2fe560f01a7
parent: abentley at panoramicfeedback.com-20060124205757-c1a5eb0641dea7eb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 15:59:13 -0500
message:
Fixed executability handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124205757-c1a5eb0641dea7eb
parent: abentley at panoramicfeedback.com-20060124204215-da753d0281921ec6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 15:57:57 -0500
message:
Implemented show-base
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124204215-da753d0281921ec6
parent: abentley at panoramicfeedback.com-20060124203420-e68268c16b8adeb6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 15:42:15 -0500
message:
Cleaned up imports, added copyright statements
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124203420-e68268c16b8adeb6
parent: abentley at panoramicfeedback.com-20060124181900-24f382871118fcc7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 15:34:20 -0500
message:
Got merge with rename working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124181900-24f382871118fcc7
parent: abentley at panoramicfeedback.com-20060124170248-0753856a890741a6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 13:19:00 -0500
message:
Fixed set_versioned, enhanced conflict testing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124170248-0753856a890741a6
parent: abentley at panoramicfeedback.com-20060124170017-bb78d19ab6961828
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 12:02:48 -0500
message:
Deleted old pre-conflict contents
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124170017-bb78d19ab6961828
parent: abentley at panoramicfeedback.com-20060124165259-3097200fe9934255
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 12:00:17 -0500
message:
Deleted old pre-conflict contents
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124165259-3097200fe9934255
parent: abentley at panoramicfeedback.com-20060124143642-485aced9472ceb4f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 11:52:59 -0500
message:
Got conflicts on symlinks working properly
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060124143642-485aced9472ceb4f
parent: abentley at panoramicfeedback.com-20060123215421-a8d53dcc745d3aa6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-24 09:36:42 -0500
message:
Fixed path-relative test cases
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060123215421-a8d53dcc745d3aa6
parent: abentley at panoramicfeedback.com-20060122164044-734d9bced6cd4dea
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Mon 2006-01-23 16:54:21 -0500
message:
Handle non-existent BASE properly
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060122164044-734d9bced6cd4dea
parent: abentley at panoramicfeedback.com-20060122162144-b99e47d5f2fc8a7a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Sun 2006-01-22 11:40:44 -0500
message:
Refactored conflict handling to generic function
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060122162144-b99e47d5f2fc8a7a
parent: aaron.bentley at utoronto.ca-20060121072938-141a4e474573eeda
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Sun 2006-01-22 11:21:44 -0500
message:
Ensured foo.BASE is a directory if there's a conflict
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060121072938-141a4e474573eeda
parent: abentley at panoramicfeedback.com-20060120224252-990de4aa4d82ff22
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-01-21 02:29:38 -0500
message:
Tested with BASE as directory
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060120224252-990de4aa4d82ff22
parent: abentley at panoramicfeedback.com-20060120145615-0afa642301fa4743
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-20 17:42:52 -0500
message:
Added more text merge tests
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060120145615-0afa642301fa4743
parent: aaron.bentley at utoronto.ca-20060120055956-887a53831d1bc293
parent: abentley at panoramicfeedback.com-20060120142258-9d09d6ff707ebd1f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-20 09:56:15 -0500
message:
Merge from bzr.ab
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060120055956-887a53831d1bc293
parent: aaron.bentley at utoronto.ca-20060119030808-d46bafe200ba4a69
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Fri 2006-01-20 00:59:56 -0500
message:
Added text merge test
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060119030808-d46bafe200ba4a69
parent: aaron.bentley at utoronto.ca-20060119014104-ee706fe1b63b48b6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-18 22:08:08 -0500
message:
Handle non-file bases
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060119014104-ee706fe1b63b48b6
parent: aaron.bentley at utoronto.ca-20060119013947-ee7046de0fc5dc97
parent: aaron.bentley at utoronto.ca-20060118015458-ba73c07352e1af17
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-18 20:41:04 -0500
message:
Merged the latest from bzr.ab
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060119013947-ee7046de0fc5dc97
parent: aaron.bentley at utoronto.ca-20060118130358-f10c5dcdc91b5c01
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-18 20:39:47 -0500
message:
fixed undefined trans_id
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060118130358-f10c5dcdc91b5c01
parent: aaron.bentley at utoronto.ca-20060118045431-a7ed22f573b5f644
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-18 08:03:58 -0500
message:
Handle all content types in three-way
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060118045431-a7ed22f573b5f644
parent: abentley at panoramicfeedback.com-20060117233849-3639b17efb3e9f40
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Tue 2006-01-17 23:54:31 -0500
message:
Defer determining trans_id until we need it, because each trans_id carries a cost.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117233849-3639b17efb3e9f40
parent: abentley at panoramicfeedback.com-20060117233548-0d75a0310c4a464f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 18:38:49 -0500
message:
Don't set executability on non-files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117233548-0d75a0310c4a464f
parent: abentley at panoramicfeedback.com-20060117232428-4ec3bbce93b25b70
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 18:35:48 -0500
message:
Reverted partial change
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117232428-4ec3bbce93b25b70
parent: abentley at panoramicfeedback.com-20060117223901-f631efa86fbc5e8f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 18:24:28 -0500
message:
Handled merging the execute bit
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117223901-f631efa86fbc5e8f
parent: abentley at panoramicfeedback.com-20060117215620-7868b818a52121a9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 17:39:01 -0500
message:
Added reprocess support, support for varying merge types
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117215620-7868b818a52121a9
parent: abentley at panoramicfeedback.com-20060117215119-43b775053a9f39c0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:56:20 -0500
message:
differentiated between this tree(input) and working tree(output) in merge.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117215119-43b775053a9f39c0
parent: abentley at panoramicfeedback.com-20060117214243-a52003965a9a2389
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:51:19 -0500
message:
Reported text conflicts programatically
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117214243-a52003965a9a2389
parent: abentley at panoramicfeedback.com-20060117213032-7f9251bd17deb6ac
parent: abentley at panoramicfeedback.com-20060117214005-4ca4d0b6dc86f1d6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:42:43 -0500
message:
Merged the merge_internals_private change
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117213032-7f9251bd17deb6ac
parent: abentley at panoramicfeedback.com-20060117212901-629ae13449804d25
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:30:32 -0500
message:
Stopped setting executability on conflict files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117212901-629ae13449804d25
parent: abentley at panoramicfeedback.com-20060117212454-80bb9a5dd1e34d4f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:29:01 -0500
message:
Stopped calling get_file_lines on WorkingTree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117212454-80bb9a5dd1e34d4f
parent: abentley at panoramicfeedback.com-20060117212354-511f293f10a80062
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:24:54 -0500
message:
Used Merge3Merger in do_merge
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117212354-511f293f10a80062
parent: abentley at panoramicfeedback.com-20060117212257-ced70932e1269d85
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:23:54 -0500
message:
Got merge functionality starting to work
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117212257-ced70932e1269d85
parent: abentley at panoramicfeedback.com-20060117212039-1e70279346a00942
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:22:57 -0500
message:
Fixed final_parent, for the case where finding a parent adds tree id paths.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060117212039-1e70279346a00942
parent: aaron.bentley at utoronto.ca-20060117130420-b28b525375b01e47
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-17 16:20:39 -0500
message:
Added reverse-lookup for versioned files and get_trans_id
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060117130420-b28b525375b01e47
parent: aaron.bentley at utoronto.ca-20060117024503-b2482f406f760e13
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Tue 2006-01-17 08:04:20 -0500
message:
Started on TreeTransform merge
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060117024503-b2482f406f760e13
parent: aaron.bentley at utoronto.ca-20060117020207-a24a499a78c212da
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Mon 2006-01-16 21:45:03 -0500
message:
Changed model again. Now iterator is used immediately.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060117020207-a24a499a78c212da
parent: abentley at lappy-20060114003738-625704a30cc1ccbd
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Mon 2006-01-16 21:02:07 -0500
message:
Moved new content generation to pre-renames
------------------------------------------------------------
merged: abentley at lappy-20060114003738-625704a30cc1ccbd
parent: abentley at lappy-20060114000330-3463c6438cc54603
committer: abentley <abentley at lappy>
branch nick: bzr.ttransform
timestamp: Fri 2006-01-13 19:37:38 -0500
message:
All tests pass under Windows
------------------------------------------------------------
merged: abentley at lappy-20060114000330-3463c6438cc54603
parent: abentley at panoramicfeedback.com-20060113234634-529aa161c0c97970
committer: abentley <abentley at lappy>
branch nick: bzr.ttransform
timestamp: Fri 2006-01-13 19:03:30 -0500
message:
Fix bug when no paramiko
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113234634-529aa161c0c97970
parent: abentley at panoramicfeedback.com-20060113205321-06820a18cf48abdd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 18:46:34 -0500
message:
Got real root moves working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113205321-06820a18cf48abdd
parent: abentley at panoramicfeedback.com-20060113190326-53128735561a232d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 15:53:21 -0500
message:
Got semi-reasonable root directory renaming working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113190326-53128735561a232d
parent: abentley at panoramicfeedback.com-20060113184944-3ebcf32dbe4ce1d1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 14:03:26 -0500
message:
Refactored _add_tree_children
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113184944-3ebcf32dbe4ce1d1
parent: abentley at panoramicfeedback.com-20060113184129-b6f7c1413250ef1c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 13:49:44 -0500
message:
Ensured we don't accidentally move the root directory
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113184129-b6f7c1413250ef1c
parent: abentley at panoramicfeedback.com-20060113183347-8a56b3b704052cdb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 13:41:29 -0500
message:
Text cleaup/docs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113183347-8a56b3b704052cdb
parent: abentley at panoramicfeedback.com-20060113182947-11c203d32426f6c7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 13:33:47 -0500
message:
Extra testing
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113182947-11c203d32426f6c7
parent: abentley at panoramicfeedback.com-20060113182703-5b12c177994eb192
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 13:29:47 -0500
message:
Ensure transform can be applied after resolution
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113182703-5b12c177994eb192
parent: abentley at panoramicfeedback.com-20060113174205-b3aece52290b266c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 13:27:03 -0500
message:
Fixed moving versioned directories
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113174205-b3aece52290b266c
parent: abentley at panoramicfeedback.com-20060113171118-cf5f9b79189db2bf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 12:42:05 -0500
message:
Handled parent loops, missing parents, unversioned parents
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113171118-cf5f9b79189db2bf
parent: abentley at panoramicfeedback.com-20060113161756-6506cbe073bca305
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 12:11:18 -0500
message:
Tested existing conflict resolution functionality
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060113161756-6506cbe073bca305
parent: abentley at lappy-20060113043532-f60c7bd6a2e1c5d8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-13 11:17:56 -0500
message:
Simplified tests
------------------------------------------------------------
merged: abentley at lappy-20060113043532-f60c7bd6a2e1c5d8
parent: abentley at panoramicfeedback.com-20060112222257-3fe3f4290b5d6618
committer: abentley <abentley at lappy>
branch nick: bzr.ttransform
timestamp: Thu 2006-01-12 23:35:32 -0500
message:
Fixed executability bug
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112222257-3fe3f4290b5d6618
parent: abentley at panoramicfeedback.com-20060112214453-64bec969a7bb82b2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 17:22:57 -0500
message:
Enhanced conflict resolution.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112214453-64bec969a7bb82b2
parent: abentley at panoramicfeedback.com-20060112205459-6b2e30cd7cc2423b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 16:44:53 -0500
message:
Implemented the backup file detritus
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112205459-6b2e30cd7cc2423b
parent: abentley at panoramicfeedback.com-20060112191840-2b54d2654ad96649
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 15:54:59 -0500
message:
Fixed up the change detection
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112191840-2b54d2654ad96649
parent: abentley at panoramicfeedback.com-20060112191347-7c7204104f82ebf3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 14:18:40 -0500
message:
Fixed thinko
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112191347-7c7204104f82ebf3
parent: abentley at panoramicfeedback.com-20060112190836-adaffb9059be66b5
parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 14:13:47 -0500
message:
Merged from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112190836-adaffb9059be66b5
parent: abentley at panoramicfeedback.com-20060112181228-2c0a812482434dc1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 14:08:36 -0500
message:
Revert fixes with disappearing roots
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112181228-2c0a812482434dc1
parent: abentley at panoramicfeedback.com-20060112180021-e5be99e8dde8d91e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 13:12:28 -0500
message:
New approach to revert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112180021-e5be99e8dde8d91e
parent: abentley at panoramicfeedback.com-20060112164401-8d5c3fcbb5810e38
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 13:00:21 -0500
message:
Detect duplicate inventory ids
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112164401-8d5c3fcbb5810e38
parent: abentley at panoramicfeedback.com-20060112143849-128d14f9cf6b314c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 11:44:01 -0500
message:
Printed conflicts in MalformedTransform
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060112143849-128d14f9cf6b314c
parent: aaron.bentley at utoronto.ca-20060112125759-fb61b12df4c62e0c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-12 09:38:49 -0500
message:
Ensured we can move/rename dangling inventory entries
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060112125759-fb61b12df4c62e0c
parent: aaron.bentley at utoronto.ca-20060112060535-a0af6198df310a8e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Thu 2006-01-12 07:57:59 -0500
message:
Started work on 'revert'
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060112060535-a0af6198df310a8e
parent: aaron.bentley at utoronto.ca-20060112053131-c17235f503e556e0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Thu 2006-01-12 01:05:35 -0500
message:
Ensured a conflict when parents of versioned files are unversioned
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060112053131-c17235f503e556e0
parent: aaron.bentley at utoronto.ca-20060112044230-e1a3c460f3d7a771
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Thu 2006-01-12 00:31:31 -0500
message:
Skipped symlink test more correctly
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060112044230-e1a3c460f3d7a771
parent: abentley at lappy-20060112041554-3bf07d73c72f2997
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-11 23:42:30 -0500
message:
Fixed transform symlink tests
------------------------------------------------------------
merged: abentley at lappy-20060112041554-3bf07d73c72f2997
parent: abentley at panoramicfeedback.com-20060111220649-8b7cf1479212c88e
committer: abentley <abentley at lappy>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-11 23:15:54 -0500
message:
Fixed some Windows bugs, introduced a conflicts bug
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111220649-8b7cf1479212c88e
parent: abentley at panoramicfeedback.com-20060111220241-98793353adebb956
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 17:06:49 -0500
message:
Removed silly code and debugging code
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111220241-98793353adebb956
parent: abentley at panoramicfeedback.com-20060111195539-97803de75696e928
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 17:02:41 -0500
message:
Got inventory ID movement working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111195539-97803de75696e928
parent: abentley at panoramicfeedback.com-20060111192248-b50877ec2b4cadce
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 14:55:39 -0500
message:
Updated docs
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111192248-b50877ec2b4cadce
parent: abentley at panoramicfeedback.com-20060111185124-46213073ac09c4bf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 14:22:48 -0500
message:
Ensured that files can be unversioned (de-versioned?)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111185124-46213073ac09c4bf
parent: abentley at panoramicfeedback.com-20060111180215-05f34320247db1cf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 13:51:24 -0500
message:
Tested adding paths
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111180215-05f34320247db1cf
parent: abentley at panoramicfeedback.com-20060111172005-ba9c5f0bb65f9df1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 13:02:15 -0500
message:
Allowed removed dirs to have content-free children.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111172005-ba9c5f0bb65f9df1
parent: abentley at panoramicfeedback.com-20060111170108-300a7de8dd48539b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 12:20:05 -0500
message:
Added rename tests
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111170108-300a7de8dd48539b
parent: abentley at panoramicfeedback.com-20060111163107-76d4a58d880c215a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 12:01:08 -0500
message:
Got file renaming working
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060111163107-76d4a58d880c215a
parent: aaron.bentley at utoronto.ca-20060111063057-81227fc71bf8bc63
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-01-11 11:31:07 -0500
message:
Proper conflicts for removals
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060111063057-81227fc71bf8bc63
parent: aaron.bentley at utoronto.ca-20060111060337-4e776a650d92be99
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-11 01:30:57 -0500
message:
Fixed naming
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060111060337-4e776a650d92be99
parent: abentley at panoramicfeedback.com-20060110183158-6b6a382ad5626eab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-11 01:03:37 -0500
message:
Got conflict handling working when conflicts involve existing files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060110183158-6b6a382ad5626eab
parent: abentley at panoramicfeedback.com-20060110165830-015c326d654bc57e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-10 13:31:58 -0500
message:
Changed tree root parent to ROOT_PARENT
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060110165830-015c326d654bc57e
parent: aaron.bentley at utoronto.ca-20060109130207-716bbbdeb72fb079
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-01-10 11:58:30 -0500
message:
Factored out topological id sorting
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060109130207-716bbbdeb72fb079
parent: aaron.bentley at utoronto.ca-20060109065228-7118afeb71312dd9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Mon 2006-01-09 08:02:07 -0500
message:
Got build passing all tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060109065228-7118afeb71312dd9
parent: aaron.bentley at utoronto.ca-20060109050653-57b1eaf9b8710558
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Mon 2006-01-09 01:52:28 -0500
message:
Nearly-working build_tree replacement
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060109050653-57b1eaf9b8710558
parent: aaron.bentley at utoronto.ca-20060109043142-33bc01bd05eb71e7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Mon 2006-01-09 00:06:53 -0500
message:
Added execute bit to new_file method
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060109043142-33bc01bd05eb71e7
parent: aaron.bentley at utoronto.ca-20060109032025-1005391c39f42ae8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-01-08 23:31:42 -0500
message:
Added conflicts for setting executability on unversioned/non-file entries
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060109032025-1005391c39f42ae8
parent: aaron.bentley at utoronto.ca-20060109025212-7fe338e114bee844
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-01-08 22:20:25 -0500
message:
Added set_executability
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060109025212-7fe338e114bee844
parent: aaron.bentley at utoronto.ca-20060108231939-ee0847dc32aea66a
parent: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-01-08 21:52:12 -0500
message:
Merge from the mainline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060108231939-ee0847dc32aea66a
parent: aaron.bentley at utoronto.ca-20060108212351-028f1f6738ff953f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-01-08 18:19:39 -0500
message:
Transform.new_entry -> Transform._new_entry
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060108212351-028f1f6738ff953f
parent: aaron.bentley at utoronto.ca-20060108204309-3eaf3faa03495a78
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-01-08 16:23:51 -0500
message:
Added symlink support
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060108204309-3eaf3faa03495a78
parent: aaron.bentley at utoronto.ca-20060107235100-8492a0656129c578
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sun 2006-01-08 15:43:09 -0500
message:
Updated docstrings
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060107235100-8492a0656129c578
parent: aaron.bentley at utoronto.ca-20060107224241-af2b552287c7fee4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-01-07 18:51:00 -0500
message:
Added directory handling
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060107224241-af2b552287c7fee4
parent: aaron.bentley at utoronto.ca-20060107214818-034649d86584b6e3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-01-07 17:42:41 -0500
message:
Added tests for parent loops
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060107214818-034649d86584b6e3
parent: aaron.bentley at utoronto.ca-20060107214104-b234adc98ba1ef02
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-01-07 16:48:18 -0500
message:
Made FinalPaths more correct
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060107214104-b234adc98ba1ef02
parent: aaron.bentley at utoronto.ca-20060107213640-63f9f986e07018f9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-01-07 16:41:04 -0500
message:
Added final_parent function
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060107213640-63f9f986e07018f9
parent: abentley at panoramicfeedback.com-20060106190537-6420270a557d4867
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Sat 2006-01-07 16:36:40 -0500
message:
Added get_tree_parent
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106190537-6420270a557d4867
parent: abentley at panoramicfeedback.com-20060106184412-4ce4893216a74de8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 14:05:37 -0500
message:
Add conflict types related to versioning
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106184412-4ce4893216a74de8
parent: abentley at panoramicfeedback.com-20060106182647-2e21a4631f992566
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 13:44:12 -0500
message:
Fixed file_kind call
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106182647-2e21a4631f992566
parent: abentley at panoramicfeedback.com-20060106182131-29327159267f9d6f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 13:26:47 -0500
message:
Implemented final_file_id
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106182131-29327159267f9d6f
parent: abentley at panoramicfeedback.com-20060106173210-44ed7fb34815bf17
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 13:21:31 -0500
message:
Added canonical_path function
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106173210-44ed7fb34815bf17
parent: abentley at panoramicfeedback.com-20060106172230-0c0d777d91fd8c68
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 12:32:10 -0500
message:
Refactored conflict handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106172230-0c0d777d91fd8c68
parent: abentley at panoramicfeedback.com-20060106171620-699bdf25e968ed5a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 12:22:30 -0500
message:
Implemented missing parent and non-directory parent conflicts
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106171620-699bdf25e968ed5a
parent: abentley at panoramicfeedback.com-20060106165906-239a7726e60cfed3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 12:16:20 -0500
message:
Fixed up includes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106165906-239a7726e60cfed3
parent: abentley at panoramicfeedback.com-20060106160637-e9daf1f3433f9bb0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 11:59:06 -0500
message:
Added TreeTransform.final_kind
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060106160637-e9daf1f3433f9bb0
parent: abentley at panoramicfeedback.com-20060105231712-d963fd5517552ae4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-01-06 11:06:37 -0500
message:
Added support for all-file path ids
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060105231712-d963fd5517552ae4
parent: abentley at panoramicfeedback.com-20060105221102-b2ae796c2d588e0f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-05 18:17:12 -0500
message:
Added conflict handling
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060105221102-b2ae796c2d588e0f
parent: abentley at panoramicfeedback.com-20060105215929-dd373b83ae4f8095
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-05 17:11:02 -0500
message:
Got unique_add under test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060105215929-dd373b83ae4f8095
parent: abentley at panoramicfeedback.com-20060105215045-3ccb43accf0933fe
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-05 16:59:29 -0500
message:
Unified all file types as 'contents'
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060105215045-3ccb43accf0933fe
parent: abentley at panoramicfeedback.com-20060105214051-d2d7c3a34667d82b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-05 16:50:45 -0500
message:
Updated to use a real root id. Or whatever the working tree considers real.
This should eventually allow us to move the root directory into a subdir.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060105214051-d2d7c3a34667d82b
parent: abentley at panoramicfeedback.com-20060105205847-078aa5990bf37f10
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-05 16:40:51 -0500
message:
Added convenience function
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060105205847-078aa5990bf37f10
parent: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-01-05 15:58:47 -0500
message:
Got creation of a versioned file working
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060125081243-0af56b5de868b0cc
parent: aaron.bentley at utoronto.ca-20060125080731-4285df84eae2e1d6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-25 03:12:43 -0500
message:
Use rename_one instead of TreeTransform in cmd_rename
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060125080731-4285df84eae2e1d6
parent: abentley at panoramicfeedback.com-20060125070807-49c069660199bb7c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ttransform
timestamp: Wed 2006-01-25 03:07:31 -0500
message:
Avoid non-file executability
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221011119-9a0c5d37d496d0d7
parent: pqm at pqm.ubuntu.com-20060220043919-b01f8960604b339d
parent: robertc at robertcollins.net-20060221004343-ccf22f64d96aa17d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 01:11:19 +0000
message:
Move the SFTP URL change for relative and absolute paths to the right place in NEWS.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060221050730-ee779d2e776fa5ce
parent: john at arbash-meinel.com-20060220185846-60c29849176c332a
parent: james.henstridge at canonical.com-20060210064025-eb9506a367a93ff2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2006-02-20 23:07:30 -0600
message:
[merge] James Henstridge: Set Agent string in http headers, add tests for it.
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060210064025-eb9506a367a93ff2
parent: james.henstridge at canonical.com-20060207032049-5b6ce8345e102f4f
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-02-10 14:40:25 +0800
message:
Make HTTP transport has() method do HEAD requests, and update test to
verify that this is the case.
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060207032049-5b6ce8345e102f4f
parent: james.henstridge at canonical.com-20060206073247-001a39bcae4ae3d6
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.dev (Main development branch)
timestamp: Tue 2006-02-07 11:20:49 +0800
message:
Fix up test_fetch tests to work with changes to log format
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060206073247-001a39bcae4ae3d6
parent: james.henstridge at canonical.com-20060206062430-3ba9f6c17499ac94
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-02-06 15:32:47 +0800
message:
Make bzrlib.transport.http.HttpServer output referer and user agent as in
common log format.
Update my new test_http tests to use TestCaseWithWebserver, and check log
to make sure user-agent is written.
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060206062430-3ba9f6c17499ac94
parent: james.henstridge at canonical.com-20060202091151-fb40d3f83952167e
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-02-06 14:24:30 +0800
message:
Add a test to make sure the user-agent header is being sent correctly.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060220185846-60c29849176c332a
parent: john at arbash-meinel.com-20060217035556-b86991407ef095d9
parent: abentley at panoramicfeedback.com-20060217155604-fb8049ff5cf2f714
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2006-02-20 12:58:46 -0600
message:
[merge] Aaron's tree-transform changes.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221165139-95f219a192c54f27
parent: pqm at pqm.ubuntu.com-20060221162439-50b779cbf0368203
parent: john at arbash-meinel.com-20060221164322-b007aa882582a66e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 16:51:39 +0000
message:
[merge] bzr.dev, cleanup conflicts, fixup http tests for new TestCase layout.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221162439-50b779cbf0368203
parent: pqm at pqm.ubuntu.com-20060221115154-a1b580a4225d536b
parent: abentley at panoramicfeedback.com-20060221152300-38559c3cdfe3370c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 16:24:39 +0000
message:
Fixed deprecated op use in test suite
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221152300-38559c3cdfe3370c
parent: abentley at panoramicfeedback.com-20060221144227-e5bcfec48b35008b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-02-21 10:23:00 -0500
message:
Fixed deprecated op use in test suite
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221144227-e5bcfec48b35008b
parent: aaron.bentley at utoronto.ca-20060221032904-781ed5b86f2c3b62
parent: pqm at pqm.ubuntu.com-20060221115154-a1b580a4225d536b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-02-21 09:42:27 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221210757-a2967f7c4589d51c
parent: abentley at panoramicfeedback.com-20060221152300-38559c3cdfe3370c
parent: abentley at panoramicfeedback.com-20060221210653-861c4a970e0d3460
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2006-02-21 16:07:57 -0500
message:
Added progress bars to tree-changing operations
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221210653-861c4a970e0d3460
parent: abentley at panoramicfeedback.com-20060221175737-f161366f8426914a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-21 16:06:53 -0500
message:
Fixed use of ui_factory (which can't be imported directly)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221175737-f161366f8426914a
parent: abentley at panoramicfeedback.com-20060221174344-f3050cca65ef4a23
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-21 12:57:37 -0500
message:
Added progress bar to pull
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221174344-f3050cca65ef4a23
parent: abentley at panoramicfeedback.com-20060221173539-9b29d7f9991d08c3
parent: pqm at pqm.ubuntu.com-20060221165139-95f219a192c54f27
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-21 12:43:44 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060221173539-9b29d7f9991d08c3
parent: abentley at panoramicfeedback.com-20060217161230-4cd4b3b76aa83a24
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Tue 2006-02-21 12:35:39 -0500
message:
Show progress bars in revert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217161230-4cd4b3b76aa83a24
parent: abentley at panoramicfeedback.com-20060217145724-d283533cacf03e7c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 11:12:30 -0500
message:
Disable merge progress bars, except from the merge command
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217145724-d283533cacf03e7c
parent: abentley at panoramicfeedback.com-20060217143929-ef39fc087bf80511
parent: abentley at panoramicfeedback.com-20060217145536-47acd73ee3dad3b4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 09:57:24 -0500
message:
Merged dangling inventory fix
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217143929-ef39fc087bf80511
parent: abentley at panoramicfeedback.com-20060217140221-60aef0b3d1998dc3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 09:39:29 -0500
message:
Added progress bars to revert.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217140221-60aef0b3d1998dc3
parent: abentley at panoramicfeedback.com-20060217134230-76d34bd5edfaa747
parent: abentley at panoramicfeedback.com-20060217135725-1aa269dda84d7f46
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 09:02:21 -0500
message:
Merged Transform [Merged Robert [Merged John]]
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060217134230-76d34bd5edfaa747
parent: abentley at panoramicfeedback.com-20060216185217-c766d147d91191d8
parent: abentley at lappy-20060217125306-89e0b981e673e3c6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Fri 2006-02-17 08:42:30 -0500
message:
Merged changes from transform
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060216185217-c766d147d91191d8
parent: abentley at panoramicfeedback.com-20060216161825-6bad50573bfd84a2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Thu 2006-02-16 13:52:17 -0500
message:
Added progress bars to merge
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221224144-83aef6ec91b8a5dc
parent: robertc at robertcollins.net-20060221215359-78567cab94e7b739
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-02-22 09:41:44 +1100
message:
Unbreak bzr push sftp:////
------------------------------------------------------------
merged: robertc at robertcollins.net-20060221215359-78567cab94e7b739
parent: pqm at pqm.ubuntu.com-20060221174102-aa6bd4464296c614
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-02-22 08:53:59 +1100
message:
Fixup internally generated deprecation warning from merge_inner.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060222222053-2c5bf0ca6e71f18d
parent: pqm at pqm.ubuntu.com-20060222075956-fb281c427e571da6
parent: abentley at panoramicfeedback.com-20060222151734-971c78a549ceb342
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-02-22 22:20:53 +0000
message:
Fixed build_tree with symlinks
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060222151734-971c78a549ceb342
parent: abentley at panoramicfeedback.com-20060222144836-2f0d747f39d956c3
parent: abentley at panoramicfeedback.com-20060222145113-495a9bf46e37e439
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-22 10:17:34 -0500
message:
Merge from integration
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060222145113-495a9bf46e37e439
parent: abentley at panoramicfeedback.com-20060221212021-98bc6d0d4a1e7639
parent: pqm at pqm.ubuntu.com-20060222075956-fb281c427e571da6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-02-22 09:51:13 -0500
message:
Merge from mainline
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060222075956-fb281c427e571da6
parent: pqm at pqm.ubuntu.com-20060222061939-b4b7825d1d580ccf
parent: mbp at sourcefrog.net-20060222070612-c108852197fc0ca4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-02-22 07:59:56 +0000
message:
add LockDir and related fixes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060222070612-c108852197fc0ca4
parent: mbp at sourcefrog.net-20060222070544-f7808ac1678c0ec8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 18:06:12 +1100
message:
LockDir review comment fixes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060222070544-f7808ac1678c0ec8
parent: mbp at sourcefrog.net-20060222055200-25345f9a35e8905d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 18:05:44 +1100
message:
rio files are always externalized in utf-8. test this.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060222055200-25345f9a35e8905d
parent: mbp at sourcefrog.net-20060222054252-b0d965d7cce9ccec
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 16:52:00 +1100
message:
LockDir doc corrections
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060222054252-b0d965d7cce9ccec
parent: mbp at sourcefrog.net-20060222043733-6fc1f11e6b19ba79
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 16:42:52 +1100
message:
docstring for LockDir.unlock
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060222043733-6fc1f11e6b19ba79
parent: mbp at sourcefrog.net-20060222042954-60333f08dd56a646
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 15:37:33 +1100
message:
Fix test_progress_note for non-80-character terminals
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060222042954-60333f08dd56a646
parent: mbp at sourcefrog.net-20060221224609-a7f433d0488c080d
parent: pqm at pqm.ubuntu.com-20060221231239-643b2cbe5aefc06a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 15:29:54 +1100
message:
[merge] from bzr.dev before integration
Fix undefined ordering in sign_my_revisions breaking tests
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060221231239-643b2cbe5aefc06a
parent: pqm at pqm.ubuntu.com-20060221212748-e81c0691edf46b65
parent: robertc at robertcollins.net-20060221224858-2b61aaa0f1636293
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-02-21 23:12:39 +0000
message:
Fixup internally generated deprecation warning from merge_inner and unbreak bzr push to new sftp branches.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221224609-a7f433d0488c080d
parent: mbp at sourcefrog.net-20060221223325-0fbe4e9583b6d853
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 09:46:09 +1100
message:
Confirm that only the intended holder of a lock was broken.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221223325-0fbe4e9583b6d853
parent: mbp at sourcefrog.net-20060221223022-0d73c36b63fc9bcf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 09:33:25 +1100
message:
Breaking an already-released lock should just succeed
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221223022-0d73c36b63fc9bcf
parent: mbp at sourcefrog.net-20060221223009-af22e77274dc6fda
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 09:30:22 +1100
message:
New LockDir.force_break and simple test case
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221223009-af22e77274dc6fda
parent: mbp at sourcefrog.net-20060221080504-583fd88ceaa3b637
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-02-22 09:30:09 +1100
message:
Warning to check storage when lock was broken
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221080504-583fd88ceaa3b637
parent: mbp at sourcefrog.net-20060221080327-b1723b722187fb63
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 19:05:04 +1100
message:
Start LockDir.confirm method and LockBroken exception
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221080327-b1723b722187fb63
parent: mbp at sourcefrog.net-20060221075354-3e2bbf0985b5523b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 19:03:27 +1100
message:
Change fancy_rename to use rand_chars rather than reinvent it.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221075354-3e2bbf0985b5523b
parent: mbp at sourcefrog.net-20060221074858-d25cba72aacf23c0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 18:53:54 +1100
message:
Put default LockDir timeouts in variables; increase timeout to 3min
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221074858-d25cba72aacf23c0
parent: mbp at sourcefrog.net-20060221070416-8aab7f0579cf38fb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 18:48:58 +1100
message:
Start adding LockDir.confirm() method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221070416-8aab7f0579cf38fb
parent: mbp at sourcefrog.net-20060221070359-e334fefdbbc1a45b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 18:04:16 +1100
message:
Run lockdir doctests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221070359-e334fefdbbc1a45b
parent: mbp at sourcefrog.net-20060221070119-53697c8b1677ad18
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 18:03:59 +1100
message:
LockDir should use Transport.rename when releasing locks too.
Add simple example of usage as a doctest.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221070119-53697c8b1677ad18
parent: mbp at sourcefrog.net-20060221065951-2f56678a03b687bc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 18:01:19 +1100
message:
Transport.rename should be unimplemented in base class
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221065951-2f56678a03b687bc
parent: mbp at sourcefrog.net-20060221063220-73a013b7fd48f00a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 17:59:51 +1100
message:
MemoryTransport.rename() must raise exceptions on collision
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221063220-73a013b7fd48f00a
parent: mbp at sourcefrog.net-20060221062726-31a9869e855950a1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 17:32:20 +1100
message:
MemoryTransport should indicate ENOTEMPTY on rmdir of nonempty, same as unix
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221062726-31a9869e855950a1
parent: mbp at sourcefrog.net-20060221060201-5f260bfe331bdc42
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 17:27:26 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060221060201-5f260bfe331bdc42
parent: mbp at sourcefrog.net-20060220222036-702b0aca3e25b5f8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 17:02:01 +1100
message:
New Transport.rename that mustn't overwrite
Change LockDir.is_held to be a property
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060220222036-702b0aca3e25b5f8
parent: mbp at sourcefrog.net-20060220221907-cd373a4714178400
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 09:20:36 +1100
message:
New LockDir locking mechanism
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060220221907-cd373a4714178400
parent: mbp at sourcefrog.net-20060220220528-33bc3e992d169b4c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 09:19:07 +1100
message:
Change some lock and transaction related exceptions to BzrNewException style
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060220220528-33bc3e992d169b4c
parent: mbp at sourcefrog.net-20060217205311-9f0171d976e71e3f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Tue 2006-02-21 09:05:28 +1100
message:
New DirectoryNotEmpty exception, and raise this from local and memory
transports.
Check that some PathError is raised when trying to remove a non-empty
directory - not necessarily DirectoryNotEmpty because sftp can't detect
it.
-- This line and the following will be ignored --
modified:
bzrlib/errors.py
bzrlib/tests/test_transport_implementations.py
bzrlib/transport/__init__.py
bzrlib/transport/memory.py
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060217205311-9f0171d976e71e3f
parent: mbp at sourcefrog.net-20060217204603-7cbfc062067a1c06
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Sat 2006-02-18 07:53:11 +1100
message:
Add TestCaseWithTransport.get_transport and get_readonly_transport
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060217204603-7cbfc062067a1c06
parent: mbp at sourcefrog.net-20060217204417-fb97e1eb0e03ee38
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Sat 2006-02-18 07:46:03 +1100
message:
New Rio.as_dict method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060217204417-fb97e1eb0e03ee38
parent: mbp at sourcefrog.net-20060217203719-b6f5b2a00d602a94
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Sat 2006-02-18 07:44:17 +1100
message:
rio.Stanza.add should raise TypeError on invalid types.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060217203719-b6f5b2a00d602a94
parent: mbp at sourcefrog.net-20060217203430-d15f555c71a6c0cd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Sat 2006-02-18 07:37:19 +1100
message:
Clean up comments
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060217203430-d15f555c71a6c0cd
parent: mbp at sourcefrog.net-20060210003925-8c64dd0c0a16d177
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks-fixed
timestamp: Sat 2006-02-18 07:34:30 +1100
message:
New utility routine rand_chars
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060210003925-8c64dd0c0a16d177
parent: mbp at sourcefrog.net-20060206103146-8bfb9a1bba84d2c9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-02-10 11:39:25 +1100
message:
[patch] better formatting for 'bzr help commands' (Matthew D Fuller)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060206103146-8bfb9a1bba84d2c9
parent: mbp at sourcefrog.net-20060206075542-12d94bc024f020e3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-02-06 21:31:46 +1100
message:
[patch] Rename TestCase.AssertSubset to assertSubset for consistency (Jan Hudec)
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060206075542-12d94bc024f020e3
parent: mbp at sourcefrog.net-20060201131742-6f81ba01f409cc1a
parent: robertc at robertcollins.net-20060201211329-b3faf2a411316ff7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-02-06 18:55:42 +1100
message:
[merge] robertc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060201131742-6f81ba01f409cc1a
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
parent: john at arbash-meinel.com-20060131200102-1cc580967bd9fe7b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-02-02 00:17:42 +1100
message:
[merge] jam-integration
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060222061939-b4b7825d1d580ccf
parent: pqm at pqm.ubuntu.com-20060222055120-bc7ccf0ab92d1632
parent: robertc at robertcollins.net-20060222055846-190a2944772a7125
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-02-22 06:19:39 +0000
message:
Merge in ui for creating and converting to knit branch - no backend support yet.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060222055120-bc7ccf0ab92d1632
parent: pqm at pqm.ubuntu.com-20060221231239-643b2cbe5aefc06a
parent: robertc at robertcollins.net-20060222054547-70f045f317b7993b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-02-22 05:51:20 +0000
message:
Fix 'bzr pull' on metadir trees.
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060222144836-2f0d747f39d956c3
parent: abentley at panoramicfeedback.com-20060222143942-ae72299f2de66767
parent: abentley at panoramicfeedback.com-20060221212021-98bc6d0d4a1e7639
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-22 09:48:36 -0500
message:
Merge from integration
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060222143942-ae72299f2de66767
parent: aaron.bentley at utoronto.ca-20060221012744-0dfd362401335acb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Transactional Tree Transforms
timestamp: Wed 2006-02-22 09:39:42 -0500
message:
Fixed build_tree with symlinks
More information about the bazaar-commits
mailing list