Rev 1429: Merge in bzrdir work to enable checkout improvements. in
/home/robertc/source/baz/checkout/
Robert Collins
robertc at robertcollins.net
Fri Feb 10 12:59:46 GMT 2006
------------------------------------------------------------
revno: 1429
revision-id: 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.
removed:
bzrlib/clone.py clone.py-20050929121333-bc726d1ddd8042bc
bzrlib/tests/test_remove.py test_remove.py-20051212071329-1925f463b565a5c3
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/repository.py rev_storage.py-20051111201905-119e9401e46257e3
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_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_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
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_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/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_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/workingtree_implementations/ workingtree_implementations-20060203003124-eada934f41adc89b
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
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/changeset.py => bzrlib/_changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/merge_core.py => bzrlib/_merge_core.py merge_core.py-20050513021216-eda88728698d4401
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
bzr bzr.py-20050313053754-5485f144c7006fa6
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/delta.py delta.py-20050729221636-54cf14ef94783d0a
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/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/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
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_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_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_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_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/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/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
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/_changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/_merge_core.py merge_core.py-20050513021216-eda88728698d4401
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-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: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
parent: mbp at sourcefrog.net-20060113063142-8e706dc1483c69e1
parent: denys.duchier at mozart-oz.org-20060112160312-2ef168ffc0964c11
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-13 18:45:31 +1100
message:
[merge] Hold locks around diff to prevent thrashing stat-cache (Denys)
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060112160312-2ef168ffc0964c11
parent: denys.duchier at mozart-oz.org-20060112140407-8fcdee0baca6d707
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.diff
timestamp: Thu 2006-01-12 17:03:12 +0100
message:
removed the lock_write method for read-only trees
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060112140407-8fcdee0baca6d707
parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-12 15:04:07 +0100
message:
lock operations for trees - use them for diff
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
parent: mbp at sourcefrog.net-20060112045444-cc2e49b5bae40e06
parent: robertc at robertcollins.net-20060112024225-fe991391e088dd58
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-12 17:37:23 +1100
message:
[merge] robertc-integration
------------------------------------------------------------
merged: robertc at robertcollins.net-20060112024225-fe991391e088dd58
parent: robertc at robertcollins.net-20060109051935-ee3847274413fe22
parent: robertc at robertcollins.net-20060112010232-32d7a5b35bbc94df
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-01-12 13:42:25 +1100
message:
* Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
paths for the transport tests. Introduce blackbox remote sftp tests that
test the same permutations. (Robert Collins, Robey Pointer)
* Transport implementation tests are now independent of the local file
system, which allows tests for esoteric transports, and for features
not available in the local file system. They also repeat for variations
on the URL scheme that can introduce issues in the transport code,
see bzrlib.transport.TransportTestProviderAdapter() for this.
(Robert Collins).
* TestCase.build_tree uses the transport interface to build trees, pass
in a transport parameter to give it an existing connection.
(Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20060112010232-32d7a5b35bbc94df
parent: robertc at robertcollins.net-20060110062704-bf190acccbdc2457
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Thu 2006-01-12 12:02:32 +1100
message:
Review feedback fixes.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060112045444-cc2e49b5bae40e06
parent: mbp at sourcefrog.net-20060111023617-858327bfdccb46e3
parent: denys.duchier at mozart-oz.org-20060111195859-3ffb9c90dba9caa9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-12 15:54:44 +1100
message:
[merge] hashcache and related cleanups from Denys
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111195859-3ffb9c90dba9caa9
parent: denys.duchier at mozart-oz.org-20060111191838-1aa7989945935f65
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Wed 2006-01-11 20:58:59 +0100
message:
hashcache: new constants and improved comment
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111191838-1aa7989945935f65
parent: denys.duchier at mozart-oz.org-20060111191229-370396538858f412
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Wed 2006-01-11 20:18:38 +0100
message:
only write the hashcache when releasing the lock
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111191229-370396538858f412
parent: denys.duchier at mozart-oz.org-20060111191035-33f9defbfcd52b4d
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Wed 2006-01-11 20:12:29 +0100
message:
hashcache: missing import for BzrError
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111191035-33f9defbfcd52b4d
parent: denys.duchier at mozart-oz.org-20060111190925-7bbe15ef3ee7b3cd
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Wed 2006-01-11 20:10:35 +0100
message:
hashcache: remove useless os.readlink
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060111190925-7bbe15ef3ee7b3cd
parent: denys.duchier at mozart-oz.org-20060109212309-919eac90ed3bb881
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Wed 2006-01-11 20:09:25 +0100
message:
hashcache: import only once from bzrlib.osutils
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20060109212309-919eac90ed3bb881
parent: denys.duchier at mozart-oz.org-20051223180321-b1aca26aa107990f
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Mon 2006-01-09 22:23:09 +0100
message:
merged from trunk
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051223180321-b1aca26aa107990f
parent: denys.duchier at mozart-oz.org-20051222190314-bc62a9e63173500a
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Fri 2005-12-23 19:03:21 +0100
message:
removed apply_changeset_tree and get_inventory_change
apply_changetset_tree not only was not used but called
tree.update_source_inventory which is not defined anywhere
get_inventory_change was only used by apply_changeset_tree
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060111023617-858327bfdccb46e3
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Wed 2006-01-11 13:36:17 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060113063142-8e706dc1483c69e1
parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-13 17:31:42 +1100
message:
Bump version to 0.8pre
------------------------------------------------------------
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: robertc at robertcollins.net-20060118011340-ab7ab3d0ecc47c0f
parent: robertc at robertcollins.net-20060117230249-a8cb74e3894b8b3d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-01-18 12:13:40 +1100
message:
Update SFTP Urls as per mailing list thread.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060117230249-a8cb74e3894b8b3d
parent: robertc at robertcollins.net-20060112024225-fe991391e088dd58
parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-01-18 10:02:49 +1100
message:
Merge from mbp.
------------------------------------------------------------
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.
More information about the bazaar-commits
mailing list