Rev 1525: [merge] robert's integration of much recent work in
/home/mbp/work/bzr.dev
Martin Pool
mbp at sourcefrog.net
Mon Jan 30 06:24:00 GMT 2006
------------------------------------------------------------
revno: 1525
revision-id: 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
removed:
bzrlib/clone.py clone.py-20050929121333-bc726d1ddd8042bc
added:
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/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_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
renamed:
bzrlib/changeset.py => bzrlib/_changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/merge_core.py => bzrlib/_merge_core.py merge_core.py-20050513021216-eda88728698d4401
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
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/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
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/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_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_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
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_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_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_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_revprops.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/_merge_core.py merge_core.py-20050513021216-eda88728698d4401
------------------------------------------------------------
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-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: 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-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: 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
More information about the bazaar-commits
mailing list