Rev 1260: merge from mbp storage branch. in
/home/robertc/source/baz/storage
Robert Collins
robertc at robertcollins.net
Tue Jan 17 22:09:11 GMT 2006
------------------------------------------------------------
revno: 1260
revision-id: 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.
added:
bzrlib/decorators.py decorators.py-20060112082512-6bfc2d882df1698d
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
HACKING HACKING-20050805200004-2a5dc975d870f78c
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
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_sampler.py testsampler.py-20051006114006-67f6d8ecb1fda6de
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
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/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
------------------------------------------------------------
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-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: robertc at robertcollins.net-20060110062704-bf190acccbdc2457
parent: robertc at robertcollins.net-20060110060118-10b2b8f44f670252
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-10 17:27:04 +1100
message:
BRANCH.TODO is done.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060110060118-10b2b8f44f670252
parent: robertc at robertcollins.net-20060110055028-b5b60fddbf24606c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-10 17:01:18 +1100
message:
Make transport test adapter tests reliable.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060110055028-b5b60fddbf24606c
parent: robertc at robertcollins.net-20060110054516-c93c279bbae5d69f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-10 16:50:28 +1100
message:
unbreak test_fetch
------------------------------------------------------------
merged: robertc at robertcollins.net-20060110054516-c93c279bbae5d69f
parent: robertc at robertcollins.net-20060110052543-5e4481bee9df7f24
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-10 16:45:16 +1100
message:
Move check_mode to TestCase.assertMode to make it generally accessible.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060110052543-5e4481bee9df7f24
parent: robertc at robertcollins.net-20060110045628-23a25c175e0c1925
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-10 16:25:43 +1100
message:
Move mkdir and copy_to permissions tests to test_transport_impleentation.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060110045628-23a25c175e0c1925
parent: robertc at robertcollins.net-20060110043922-cd7ddc4554ad2df1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-10 15:56:28 +1100
message:
Move put mode tests into test_transport_implementation.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060110043922-cd7ddc4554ad2df1
parent: robertc at robertcollins.net-20060110040907-0bec8d261e79217b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-10 15:39:22 +1100
message:
Remove duplicate web server from HTTPTestUtil.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060110040907-0bec8d261e79217b
parent: robertc at robertcollins.net-20060110040839-f5db7e1fba6a752a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-10 15:09:07 +1100
message:
Update BRANCH.TODO
------------------------------------------------------------
merged: robertc at robertcollins.net-20060110040839-f5db7e1fba6a752a
parent: robertc at robertcollins.net-20060110011019-c60a1ae0fef4dc93
parent: robertc at robertcollins.net-20060109051935-ee3847274413fe22
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-10 15:08:39 +1100
message:
Merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060109051935-ee3847274413fe22
parent: robertc at robertcollins.net-20060105224859-b3a1f2be759672fc
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-01-09 16:19:35 +1100
message:
merge from Martin.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
parent: mbp at sourcefrog.net-20060108233527-3f536f604c954d72
parent: mbp at sourcefrog.net-20060106121804-effcf89487f01864
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-09 12:51:38 +1100
message:
[merge] Move in tutorial text from wiki.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060106121804-effcf89487f01864
parent: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-06 23:18:04 +1100
message:
Move in tutorial text from wiki.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
parent: mbp at sourcefrog.net-20060105090132-968677325eab0148
parent: robertc at robertcollins.net-20060105224859-b3a1f2be759672fc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2006-01-06 12:13:05 +1100
message:
[merge] robertc
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105224859-b3a1f2be759672fc
parent: robertc at robertcollins.net-20060105214856-c88e035070de8465
parent: robertc at robertcollins.net-20060105224446-a1ee05b67dead4fc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-01-06 09:48:59 +1100
message:
Merge in :
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
for functions that need unicode strings. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105224446-a1ee05b67dead4fc
parent: robertc at robertcollins.net-20060105223059-a8b64f7b47cf12fb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: safe_unicode
timestamp: Fri 2006-01-06 09:44:46 +1100
message:
An extra test for John.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105223059-a8b64f7b47cf12fb
parent: robertc at robertcollins.net-20060105214856-c88e035070de8465
committer: Robert Collins <robertc at robertcollins.net>
branch nick: safe_unicode
timestamp: Fri 2006-01-06 09:30:59 +1100
message:
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
for functions that need unicode strings. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105214856-c88e035070de8465
parent: robertc at robertcollins.net-20060105213257-72e57eb4e30b0bc2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-01-06 08:48:56 +1100
message:
Bugfix the symbol_versioning deprecation decorators to update the
__module__ attribute of methods and functions. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105213257-72e57eb4e30b0bc2
parent: robertc at robertcollins.net-20060104233225-7ce047eb1fca63ec
parent: robertc at robertcollins.net-20060105124646-af18da35bc3f64b4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-01-06 08:32:57 +1100
message:
* Deprecated functions and methods can now be marked as such using the
bzrlib.symbol_versioning module. Marked method have their docstring
updated and will issue a DeprecationWarning using the warnings module
when they are used. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105124646-af18da35bc3f64b4
parent: robertc at robertcollins.net-20060105120726-6c818f10b227aa62
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecation
timestamp: Thu 2006-01-05 23:46:46 +1100
message:
Set the __name__ attribute on decorated methods and functions.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105120726-6c818f10b227aa62
parent: robertc at robertcollins.net-20060105114350-e21c40532770563e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecation
timestamp: Thu 2006-01-05 23:07:26 +1100
message:
Update NEWS and HACKING for the symbol_versioning module.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105114350-e21c40532770563e
parent: robertc at robertcollins.net-20060105110307-21db4cbdfd94f2c6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecation
timestamp: Thu 2006-01-05 22:43:50 +1100
message:
decorate docstrings in deprecated functions.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105110307-21db4cbdfd94f2c6
parent: robertc at robertcollins.net-20060105104926-6e5dc14eff2352ca
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecation
timestamp: Thu 2006-01-05 22:03:07 +1100
message:
Implement deprecated_function.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060105104926-6e5dc14eff2352ca
parent: robertc at robertcollins.net-20060104233225-7ce047eb1fca63ec
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecation
timestamp: Thu 2006-01-05 21:49:26 +1100
message:
Implement deprecated_method
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060105090132-968677325eab0148
parent: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-01-05 20:01:32 +1100
message:
todo idea from John
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060108233527-3f536f604c954d72
parent: mbp at sourcefrog.net-20060108233414-d62c4e95c75a3f34
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-09 10:35:27 +1100
message:
Prepare for 0.7rc1 release
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060108233414-d62c4e95c75a3f34
parent: mbp at sourcefrog.net-20060108223956-fcfb6cf192119490
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-09 10:34:14 +1100
message:
ignore .sw[nop] by default
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060108223956-fcfb6cf192119490
parent: mbp at sourcefrog.net-20060106011305-3772285d84b5cbb4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-09 09:39:56 +1100
message:
Don't ignore Makefile.in by default (#6413)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060110011019-c60a1ae0fef4dc93
parent: robertc at robertcollins.net-20060103030420-43db89e56ea7e350
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-10 12:10:19 +1100
message:
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060103030420-43db89e56ea7e350
parent: robertc at robertcollins.net-20060103030007-879f80dd6dc82a00
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-03 14:04:20 +1100
message:
Trim legacy transport tests back to mode, which cannot be tested across the board usefully.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060103030007-879f80dd6dc82a00
parent: robertc at robertcollins.net-20060103024317-7e36a5a01d2f8069
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-03 14:00:07 +1100
message:
Test bogus urls with http in the new infrastructure.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060103024317-7e36a5a01d2f8069
parent: robertc at robertcollins.net-20060103020706-998bb02793088bdf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-03 13:43:17 +1100
message:
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060103020706-998bb02793088bdf
parent: robertc at robertcollins.net-20051228221949-e9b25a75ac80edd3
parent: robertc at robertcollins.net-20060102225445-8554f5b0109dbc41
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2006-01-03 13:07:06 +1100
message:
merge integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051228221949-e9b25a75ac80edd3
parent: robertc at robertcollins.net-20051227230143-a76349838155a778
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Thu 2005-12-29 09:19:49 +1100
message:
Trim duplicate sftp tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051227230143-a76349838155a778
parent: robertc at robertcollins.net-20051227225212-f3cfb3ece3c17998
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Wed 2005-12-28 10:01:43 +1100
message:
Reinstate Memory parameter tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051227225212-f3cfb3ece3c17998
parent: robertc at robertcollins.net-20051227111517-51d0fe370eaa9ac8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Wed 2005-12-28 09:52:12 +1100
message:
integrate Memory tests into transport interface tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051227111517-51d0fe370eaa9ac8
parent: robertc at robertcollins.net-20051226023129-d88c695d1bb7c5cc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Tue 2005-12-27 22:15:17 +1100
message:
transport implementations now tested consistently.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051226023129-d88c695d1bb7c5cc
parent: robertc at robertcollins.net-20051224062537-186c50cb3a4509b3
parent: robertc at robertcollins.net-20051209023648-84dd2e94fc376358
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Mon 2005-12-26 13:31:29 +1100
message:
Merge in sftp-rfc-tests branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051209023648-84dd2e94fc376358
parent: robertc at robertcollins.net-20051208055700-5d85edd70fd15d4d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: sftp_rfc_tests
timestamp: Fri 2005-12-09 13:36:48 +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)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051224062537-186c50cb3a4509b3
parent: robertc at robertcollins.net-20051215083203-07b824bae89674c1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-providers
timestamp: Sat 2005-12-24 17:25:37 +1100
message:
Minimal infrastructure to test TransportTestProviderAdapter.
------------------------------------------------------------
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-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
More information about the bazaar-commits
mailing list