Rev 1435: Merge from integration. in
/home/robertc/source/baz/test-apis
Robert Collins
robertc at robertcollins.net
Thu Jan 12 02:59:34 GMT 2006
------------------------------------------------------------
revno: 1435
revision-id: 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.
added:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
renamed:
bzrlib/tests/test_revision_info.py => bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/test_sftp.py => bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/export/dir_exporter.py dir_exporter.py-20051114235828-b51397f56bc7b117
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/externalcommand.py externalcommand.py-20050901092254-b4fc642a55bb815b
bzrlib/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/intset.py intset.py-20050717175247-81cd658f9aaa2731
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/merge.py* merge.py-20050513021216-953b65a438527106
bzrlib/merge_core.py merge_core.py-20050513021216-eda88728698d4401
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
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/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_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_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_gpg.py testgpg.py-20051017042228-9276cd40a784c93c
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_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_sampler.py testsampler.py-20051006114006-67f6d8ecb1fda6de
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
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/tests/treeshape.py treeshape.py-20051004094628-312a98f0194306a8
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/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
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: robertc at robertcollins.net-20060104233225-7ce047eb1fca63ec
parent: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
parent: john at arbash-meinel.com-20060103154418-e6b640e95a1d0e03
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-01-05 10:32:25 +1100
message:
Merge from jam-integration.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103154418-e6b640e95a1d0e03
parent: john at arbash-meinel.com-20060103154333-d2620f4ef0458ac5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-03 09:44:18 -0600
message:
Changed exception traceback route to not use hasattr, which generates its own exception.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103154333-d2620f4ef0458ac5
parent: john at arbash-meinel.com-20060103153337-115c924bb00ae6b3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-03 09:43:33 -0600
message:
Fixed exception handling for fancy_rename
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103153337-115c924bb00ae6b3
parent: john at arbash-meinel.com-20060103152652-5a066586feb99370
parent: john at arbash-meinel.com-20060103151011-2ad890a2ff1475a4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-03 09:33:37 -0600
message:
[merge] bzr-jam-pending 1498
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103151011-2ad890a2ff1475a4
parent: john at arbash-meinel.com-20051230220342-1b6b476e301bb9b4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Tue 2006-01-03 09:10:11 -0600
message:
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230220342-1b6b476e301bb9b4
parent: john at arbash-meinel.com-20051230220140-49a50fa3e9215751
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 16:03:42 -0600
message:
Whitespace cleanup.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230220140-49a50fa3e9215751
parent: john at arbash-meinel.com-20051230205447-e72814c9e3f22832
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 16:01:40 -0600
message:
Updated test_set_user_setting_sets_and_saves to remove the print statement, and make sure it is doing the right thing
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230205447-e72814c9e3f22832
parent: john at arbash-meinel.com-20051230204950-1d268051a677a105
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 14:54:47 -0600
message:
Updated -r revid:foo so that it can match revisions which aren't in the revision history
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230204950-1d268051a677a105
parent: john at arbash-meinel.com-20051230204348-692603ab9626b8d1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 14:49:50 -0600
message:
Forgot a comma
------------------------------------------------------------
merged: john at arbash-meinel.com-20051230204348-692603ab9626b8d1
parent: john at arbash-meinel.com-20051229023607-95f3ed4a0404cfa5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Fri 2005-12-30 14:43:48 -0600
message:
Sorted the blackbox tests into alphabetical order.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051229023607-95f3ed4a0404cfa5
parent: john at arbash-meinel.com-20051228194754-27fd0b38f0b9a7f2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2005-12-28 20:36:07 -0600
message:
test_revision_info.py is actually a blackbox test.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051228194754-27fd0b38f0b9a7f2
parent: john at arbash-meinel.com-20051222233243-1ff7ae626c03d3d3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-pending
timestamp: Wed 2005-12-28 13:47:54 -0600
message:
bzr --version prints branch nickname.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051222233243-1ff7ae626c03d3d3
parent: john at arbash-meinel.com-20051222232530-4e3a7260b6f0384b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-22 17:32:43 -0600
message:
Whitespace cleanups.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051222232530-4e3a7260b6f0384b
parent: john at arbash-meinel.com-20051222141507-756316fc76229621
parent: denys.duchier at mozart-oz.org-20051222190314-bc62a9e63173500a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-22 17:25:30 -0600
message:
[merge] Dennis Duchier, some cleanups of the bzr merge code.
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051222190314-bc62a9e63173500a
parent: denys.duchier at mozart-oz.org-20051222185700-2a2fbee2e89c40d5
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Thu 2005-12-22 20:03:14 +0100
message:
sort with key and reverse is standard in Python 2.4
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051222185700-2a2fbee2e89c40d5
parent: denys.duchier at mozart-oz.org-20051222183620-e8b04a95ac15de41
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Thu 2005-12-22 19:57:00 +0100
message:
"reversed" is standard in Python 2.4
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051222183620-e8b04a95ac15de41
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.cleanup
timestamp: Thu 2005-12-22 19:36:20 +0100
message:
removed support for applying changesets in reverse
Reverse application of a changeset can just as well be achieved by
reversing the changeset itself (i.e. exchanging the sides) and then
applying it forward.
Following Aaron's suggestion, I also removed support for composing
changesets.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
parent: mbp at sourcefrog.net-20051216003931-476d497e6dbd21b9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-16 12:47:35 +1100
message:
Remove config.guess and configure.in from builtin ignore list.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051216003931-476d497e6dbd21b9
parent: mbp at sourcefrog.net-20051216002517-73448ea063865983
parent: robertc at robertcollins.net-20051215083203-07b824bae89674c1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-16 11:39:31 +1100
message:
[merge] robert
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051216002517-73448ea063865983
parent: mbp at sourcefrog.net-20051216001728-5c9086013d1bbf8f
parent: robertc at robertcollins.net-20051214090140-b70938f467aaea6f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-16 11:25:17 +1100
message:
[merge] robertc: file encoding tests, and run all tests in C locale as well as default
------------------------------------------------------------
merged: robertc at robertcollins.net-20051214090140-b70938f467aaea6f
parent: robertc at robertcollins.net-20051214075326-3c1f619fa0f73514
committer: Robert Collins <robertc at robertcollins.net>
branch nick: run_tests_twice_for_i18n
timestamp: Wed 2005-12-14 20:01:40 +1100
message:
forgot my self.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051214075326-3c1f619fa0f73514
parent: robertc at robertcollins.net-20051212233303-1084576233b6e3b1
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Robert Collins <robertc at robertcollins.net>
branch nick: run_tests_twice_for_i18n
timestamp: Wed 2005-12-14 18:53:26 +1100
message:
Merge from upstream.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051212233303-1084576233b6e3b1
parent: robertc at robertcollins.net-20051212231443-a2228c4350ea0a14
committer: Robert Collins <robertc at robertcollins.net>
branch nick: run_tests_twice_for_i18n
timestamp: Tue 2005-12-13 10:33:03 +1100
message:
Fix typo in my msgeditor test changes.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051212231443-a2228c4350ea0a14
parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
committer: Robert Collins <robertc at robertcollins.net>
branch nick: run_tests_twice_for_i18n
timestamp: Tue 2005-12-13 10:14:43 +1100
message:
Run the test suite with no locale as well as the default locale. Also add a test for build_tree_shape to selftest.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20051216001728-5c9086013d1bbf8f
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-16 11:17:28 +1100
message:
Add notes on merge/review process.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051222141507-756316fc76229621
parent: john at arbash-meinel.com-20051221163838-e5a9f3cb827de3e0
parent: denys.duchier at mozart-oz.org-20051221231921-e38aacd973ce2e59
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-22 08:15:07 -0600
message:
[merge] Denys Duchier, more tests for test_merge_core, and fixup of one test.
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051221231921-e38aacd973ce2e59
parent: denys.duchier at mozart-oz.org-20051221220143-193db4ab8caca5d1
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests
timestamp: Thu 2005-12-22 00:19:21 +0100
message:
bug fix: missing basename in test_file_moves
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051221220143-193db4ab8caca5d1
parent: denys.duchier at mozart-oz.org-20051221215958-368732b52af4b8a3
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests2
timestamp: Wed 2005-12-21 23:01:43 +0100
message:
4 new merge tests suggested by abentley
------------------------------------------------------------
merged: denys.duchier at mozart-oz.org-20051221215958-368732b52af4b8a3
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Denys Duchier <denys.duchier at mozart-oz.org>
branch nick: bzr.tests2
timestamp: Wed 2005-12-21 22:59:58 +0100
message:
two new tests suggested by abentley
------------------------------------------------------------
merged: john at arbash-meinel.com-20051221163838-e5a9f3cb827de3e0
parent: john at arbash-meinel.com-20051220024527-c62e00c739161df8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2005-12-21 10:38:38 -0600
message:
[patch] from duchier, include more tests of the merge core.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051220024527-c62e00c739161df8
parent: john at arbash-meinel.com-20051219203101-7d7eba36c66dbfc4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 20:45:27 -0600
message:
Whitespace and other formatting cleanups suggested by Robert.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051219203101-7d7eba36c66dbfc4
parent: john at arbash-meinel.com-20051219182315-9ff26ff83ae1c43e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 14:31:01 -0600
message:
Lots of updates for 'bzr check'
Added get_sha1() to Weave,
Updated RevisionTree so that it takes a Branch
(thus it can use get_transaction()),
changed 'bzr check' so that it uses Weave.check(),
rather than having each file extract its own text
------------------------------------------------------------
merged: john at arbash-meinel.com-20051219182315-9ff26ff83ae1c43e
parent: john at arbash-meinel.com-20051219180840-331adddc8d5627c3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 12:23:15 -0600
message:
Cleaned up the check code by using self._walk() instead of manually writing the loop.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051219180840-331adddc8d5627c3
parent: john at arbash-meinel.com-20051219180624-c16ede0bafc0c21c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 12:08:40 -0600
message:
Change Weave.check() so that it checks all revisions in parallel.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051219180624-c16ede0bafc0c21c
parent: john at arbash-meinel.com-20051219174825-3046c2b52fda89dc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 12:06:24 -0600
message:
IntSet doesn't actually provide a performance improvement, so ignore it
------------------------------------------------------------
merged: john at arbash-meinel.com-20051219174825-3046c2b52fda89dc
parent: john at arbash-meinel.com-20051219173644-673e0a432d001872
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 11:48:25 -0600
message:
Added set_remove to get the set delete function to IntSet
------------------------------------------------------------
merged: john at arbash-meinel.com-20051219173644-673e0a432d001872
parent: john at arbash-meinel.com-20051218151719-166c90b56986dc5d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2005-12-19 11:36:44 -0600
message:
Adding sha1 check when weave extracts a text.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051218151719-166c90b56986dc5d
parent: john at arbash-meinel.com-20051218151239-a402a0ddc0f9628b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2005-12-18 09:17:19 -0600
message:
Forgot to add the test.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051218151239-a402a0ddc0f9628b
parent: john at arbash-meinel.com-20051218040846-3d1acb9e626e8671
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2005-12-18 09:12:39 -0600
message:
Added a test for basis-inventory, which should have happened before.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051218040846-3d1acb9e626e8671
parent: john at arbash-meinel.com-20051216053312-dab01659fc8874f0
parent: john at arbash-meinel.com-20051216150328-3bb1090f181b4c5a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sat 2005-12-17 22:08:46 -0600
message:
merge permissions branch, also fixup tests so they are lined up with bzr.dev to help prevent conflicts.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216150328-3bb1090f181b4c5a
parent: john at arbash-meinel.com-20051216062207-f8a9ca3f32934a86
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Fri 2005-12-16 09:03:28 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216062207-f8a9ca3f32934a86
parent: john at arbash-meinel.com-20051216061348-219db42d609774a1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Fri 2005-12-16 00:22:07 -0600
message:
Changing so that sftp tests are skipped rather than hidden when paramiko isn't present
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216061348-219db42d609774a1
parent: john at arbash-meinel.com-20051216061100-6136fb5a1c3acacb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Fri 2005-12-16 00:13:48 -0600
message:
Made the StubSFTPServer use umask even for mkdir()
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216061100-6136fb5a1c3acacb
parent: john at arbash-meinel.com-20051216013044-9d16c210eae6041d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Fri 2005-12-16 00:11:00 -0600
message:
[patch] Robey Pointer to fix sftp server using umask for files (failing tests for directories)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216013044-9d16c210eae6041d
parent: john at arbash-meinel.com-20051215234657-984969271a333a76
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 19:30:44 -0600
message:
added NEWS entry.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215234657-984969271a333a76
parent: john at arbash-meinel.com-20051215220036-e1f4de8dff952819
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 17:46:57 -0600
message:
Moved chmod to after pipelined file upload
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215220036-e1f4de8dff952819
parent: john at arbash-meinel.com-20051215213934-c604f80de4902abf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 16:00:36 -0600
message:
Added the ability to disable setting permissions
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215213934-c604f80de4902abf
parent: john at arbash-meinel.com-20051215213003-6182bfb1ace9cfc3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 15:39:34 -0600
message:
Stores don't have to have a dir_mode or file_mode set
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215213003-6182bfb1ace9cfc3
parent: john at arbash-meinel.com-20051215211109-3c96c1af8cd45cdd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 15:30:03 -0600
message:
It turns out that only the StubSFTPServer doesn't mask on open(), adding a chmod call after open
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215211109-3c96c1af8cd45cdd
parent: john at arbash-meinel.com-20051215200502-ece3c53709876892
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 15:11:09 -0600
message:
Added permission checking to Branch, and propogated that change into the stores.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215200502-ece3c53709876892
parent: john at arbash-meinel.com-20051215200303-be2d09abef0f6e57
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 14:05:02 -0600
message:
code cleanup
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215200303-be2d09abef0f6e57
parent: john at arbash-meinel.com-20051215175931-0a302899643581cd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 14:03:03 -0600
message:
Added mode to the appropriate transport functions, and tests to make sure they work.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051215175931-0a302899643581cd
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-permissions
timestamp: Thu 2005-12-15 11:59:31 -0600
message:
Added new permissions test (currently don't pass)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216053312-dab01659fc8874f0
parent: john at arbash-meinel.com-20051204215501-9ee53a39579d1e28
parent: john at arbash-meinel.com-20051216051321-0a46118f3dd3ccc7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Thu 2005-12-15 23:33:12 -0600
message:
[merge] win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216051321-0a46118f3dd3ccc7
parent: john at arbash-meinel.com-20051216045300-316811378703a220
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-15 23:13:21 -0600
message:
get_transport() now forces unicode paths, which helps get proper filenames.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216045300-316811378703a220
parent: john at arbash-meinel.com-20051216044207-b1fdf835d8432d3f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-15 22:53:00 -0600
message:
Switch to sys.executable instead of just 'python' to make sure to run the right executable
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216044207-b1fdf835d8432d3f
parent: john at arbash-meinel.com-20051216034314-1a87179af364d10b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-15 22:42:07 -0600
message:
Updating for new transport tests so that they pass on win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216034314-1a87179af364d10b
parent: john at arbash-meinel.com-20051216031326-59a5010e2358813f
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-15 21:43:14 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216031326-59a5010e2358813f
parent: john at arbash-meinel.com-20051208183243-89d8bc3803f44848
parent: john at arbash-meinel.com-20051216022556-6abfc63e721f4b95
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-15 21:13:26 -0600
message:
[merge] use the correct python executable
------------------------------------------------------------
merged: john at arbash-meinel.com-20051216022556-6abfc63e721f4b95
parent: john at arbash-meinel.com-20051202221807-418d7ebc9e008cd2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-15 20:25:56 -0600
message:
Use the correct python in case it isn't in the path
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202221807-418d7ebc9e008cd2
parent: john at arbash-meinel.com-20051202220622-41882e3b259fd8f2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Fri 2005-12-02 16:18:07 -0600
message:
Win32 not only doesn't have cat, it changes line-endings too. Should be fixed.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202220622-41882e3b259fd8f2
parent: john at arbash-meinel.com-20051202041607-e97ca8a3d0e7fd48
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Fri 2005-12-02 16:06:22 -0600
message:
Switching from cat to python -c, since we should always have a python interpreter.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202041607-e97ca8a3d0e7fd48
parent: john at arbash-meinel.com-20051202020927-0708e0ef7f7c5923
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 22:16:07 -0600
message:
O_BINARY doesn't exist outside of win32, don't pass it if it isn't there.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202020927-0708e0ef7f7c5923
parent: john at arbash-meinel.com-20051202000711-a95f52add0b1493c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 20:09:27 -0600
message:
Setting binary flags for sftp.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051202000711-a95f52add0b1493c
parent: john at arbash-meinel.com-20051201235216-50aa021d8ed62620
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 18:07:11 -0600
message:
Renaming test_sftp.py => test_sftp_transport.py, so that 'bzr selftest transport' will run it too
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201235216-50aa021d8ed62620
parent: john at arbash-meinel.com-20051201225317-cb05136dbbf947e8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 17:52:16 -0600
message:
Some corrections using the new osutils.rename. **ALL TESTS PASS**
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201225317-cb05136dbbf947e8
parent: john at arbash-meinel.com-20051201225026-142c9a5a04bb38ba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 16:53:17 -0600
message:
Added a small test to sftp to make sure some replacing was going on in the remote side.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201225026-142c9a5a04bb38ba
parent: john at arbash-meinel.com-20051201214924-17e90ecb4031c39d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 16:50:26 -0600
message:
Added a fancy footwork rename to osutils, made SftpTransport use it.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201214924-17e90ecb4031c39d
parent: john at arbash-meinel.com-20051201211149-adf18296c664f8d5
parent: john at arbash-meinel.com-20051201213142-3bf0c6acc9c5355d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 15:49:24 -0600
message:
[merge] jam-integration
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201211149-adf18296c664f8d5
parent: john at arbash-meinel.com-20051201205836-7ac6c2ef4b1cbcf3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 15:11:49 -0600
message:
Refactoring Exceptions found some places where the wrong exception was caught.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201205836-7ac6c2ef4b1cbcf3
parent: john at arbash-meinel.com-20051201195743-57aefc694d237938
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 14:58:36 -0600
message:
Cleaned up Exceptions for all transports.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201195743-57aefc694d237938
parent: john at arbash-meinel.com-20051201194342-da551dc3c2a1903a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 13:57:43 -0600
message:
Reintroduced ensure_config_dir_exists() for sftp
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201194342-da551dc3c2a1903a
parent: john at arbash-meinel.com-20051201194225-ccbd5466df7af898
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 13:43:42 -0600
message:
Updated whitebox text for new PathNotChild exception
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201194225-ccbd5466df7af898
parent: john at arbash-meinel.com-20051201192748-369238cd06ecf7e8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 13:42:25 -0600
message:
Creating a PathNotChild exception, and using relpath in HTTPTestUtil
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201192748-369238cd06ecf7e8
parent: john at arbash-meinel.com-20051201191230-a2ba94c380e11863
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 13:27:48 -0600
message:
Added osutils.mkdtemp()
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201191230-a2ba94c380e11863
parent: john at arbash-meinel.com-20051201183335-578f560fb6f8d3c3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 13:12:30 -0600
message:
Replacing os.getcwdu() with osutils.getcwd(),
fixing config test which expected config_dir() to have a specific path
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201183335-578f560fb6f8d3c3
parent: john at arbash-meinel.com-20051201181647-2d65af900f14ba6a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 12:33:35 -0600
message:
Changing os.path.normpath to osutils.normpath
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201181647-2d65af900f14ba6a
parent: john at arbash-meinel.com-20051201180300-00f2e67ecf02f55e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 12:16:47 -0600
message:
Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201180300-00f2e67ecf02f55e
parent: john at arbash-meinel.com-20051201175357-afaa3b6ded6cb81c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 12:03:00 -0600
message:
Fixup test_config.py to handle new paths
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201175357-afaa3b6ded6cb81c
parent: john at arbash-meinel.com-20051201173629-aecb08238e0976a2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 11:53:57 -0600
message:
Couple small fixes, all tests pass on cygwin.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201173629-aecb08238e0976a2
parent: john at arbash-meinel.com-20051201172516-5232226cd9ec1f0e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 11:36:29 -0600
message:
Removing instances of os.sep
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201172516-5232226cd9ec1f0e
parent: john at arbash-meinel.com-20051201171125-5e1f0970246c4925
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 11:25:16 -0600
message:
A couple more path.join statements needed changing.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201171125-5e1f0970246c4925
parent: john at arbash-meinel.com-20051201163508-407545e8302b778c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 11:11:25 -0600
message:
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201163508-407545e8302b778c
parent: john at arbash-meinel.com-20051201152458-4284f6a9025751b0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 10:35:08 -0600
message:
avoiding 'bzr pull .' means all tests pass under cygwin
------------------------------------------------------------
merged: john at arbash-meinel.com-20051201152458-4284f6a9025751b0
parent: john at arbash-meinel.com-20051130230916-9aa0dd45072c7e29
parent: john at arbash-meinel.com-20051201152250-e794a08480d6dfa9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-01 09:24:58 -0600
message:
[merge] jam-integration
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130230916-9aa0dd45072c7e29
parent: john at arbash-meinel.com-20051130171152-95fc4cd6adf2aa8c
parent: john at arbash-meinel.com-20051130224614-bf204f5bf2201072
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Wed 2005-11-30 17:09:16 -0600
message:
[merge] jam-integration, fix close_fds on win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130171152-95fc4cd6adf2aa8c
parent: john at arbash-meinel.com-20051130145745-2055e3cc04ca5bb5
parent: john at arbash-meinel.com-20051130165254-9e8cb6d9383a06f7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Wed 2005-11-30 11:11:52 -0600
message:
[merge] jam-integration
------------------------------------------------------------
merged: john at arbash-meinel.com-20051130145745-2055e3cc04ca5bb5
parent: john at arbash-meinel.com-20051123154759-784e7805281e831c
parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Wed 2005-11-30 08:57:45 -0600
message:
[merge] bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20051208183243-89d8bc3803f44848
parent: john at arbash-meinel.com-20051202221807-418d7ebc9e008cd2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-win32
timestamp: Thu 2005-12-08 12:32:43 -0600
message:
Added (win32 failing) test to make sure is_executable is maintained over several operations
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103152652-5a066586feb99370
parent: john at arbash-meinel.com-20060102212036-5013c8712ee1e1ba
parent: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-01-03 09:26:52 -0600
message:
[merge] robert & aaron's integration
------------------------------------------------------------
merged: robertc at robertcollins.net-20060103052137-4956578fbb0736ba
parent: robertc at robertcollins.net-20060102225445-8554f5b0109dbc41
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-03 16:21:37 +1100
message:
Add BRANCH.TODO, and update Makefile to clean pyo files.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060102225445-8554f5b0109dbc41
parent: robertc at robertcollins.net-20060102223732-d5221b37ff0f7888
parent: aaron.bentley at utoronto.ca-20051226062928-09c4e07bcdfce3af
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-03 09:54:45 +1100
message:
Merge Aarons integration branch.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226062928-09c4e07bcdfce3af
parent: aaron.bentley at utoronto.ca-20051226052838-b90834b8788c7101
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2005-12-26 01:29:28 -0500
message:
Fixed hashcache
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051226052838-b90834b8788c7101
parent: aaron.bentley at utoronto.ca-20051222031427-8479fe2c80b0a5c1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2005-12-26 00:28:38 -0500
message:
Reactivated hashcache tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051222031427-8479fe2c80b0a5c1
parent: aaron.bentley at utoronto.ca-20051215071914-836bc288d9f55a5b
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2005-12-21 22:14:27 -0500
message:
Merged Martin's latest
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051215071914-836bc288d9f55a5b
parent: aaron.bentley at utoronto.ca-20051215065024-658b20fddd26a9ec
parent: abentley at panoramicfeedback.com-20051214183411-f013b7006e68d0eb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2005-12-15 02:19:14 -0500
message:
Merged in other version of NEWS update
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051215065024-658b20fddd26a9ec
parent: aaron.bentley at utoronto.ca-20051215064846-aa6cb6c42313c8e3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2005-12-15 01:50:24 -0500
message:
Removed ignore for configure.in, which is never autogenerated.
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051215064846-aa6cb6c42313c8e3
parent: abentley at panoramicfeedback.com-20051213201315-8f8f4ab3bc677d35
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2005-12-15 01:48:46 -0500
message:
Updated NEWS
------------------------------------------------------------
merged: robertc at robertcollins.net-20060102223732-d5221b37ff0f7888
parent: robertc at robertcollins.net-20060102211101-672549a6c738eb0e
parent: john at arbash-meinel.com-20051222233243-1ff7ae626c03d3d3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-03 09:37:32 +1100
message:
Merge in John Meinels integration branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060102211101-672549a6c738eb0e
parent: robertc at robertcollins.net-20051215083203-07b824bae89674c1
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-03 08:11:01 +1100
message:
Merge from mbp.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060102212036-5013c8712ee1e1ba
parent: john at arbash-meinel.com-20051222233243-1ff7ae626c03d3d3
parent: jaq at spacepants.org-20051230032520-d205be03bad624bd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Mon 2006-01-02 15:20:36 -0600
message:
[merge] Jamie Wilkinson, don't export .bzrignore
------------------------------------------------------------
merged: jaq at spacepants.org-20051230032520-d205be03bad624bd
parent: jaq at spacepants.org-20051229033359-0f03c77b1f99af3b
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Fri 2005-12-30 14:25:20 +1100
message:
add test for directory export
------------------------------------------------------------
merged: jaq at spacepants.org-20051229033359-0f03c77b1f99af3b
parent: jaq at spacepants.org-20051229032631-adc1a9413791860f
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Thu 2005-12-29 14:33:59 +1100
message:
rearrange blackbox tests to be in alphabetical order
------------------------------------------------------------
merged: jaq at spacepants.org-20051229032631-adc1a9413791860f
parent: jaq at spacepants.org-20051229025233-c702c32a14b5001c
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Thu 2005-12-29 14:26:31 +1100
message:
convert tabs to 4-spaces
------------------------------------------------------------
merged: jaq at spacepants.org-20051229025233-c702c32a14b5001c
parent: jaq at spacepants.org-20051229024306-e9ab99850c605c5f
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Thu 2005-12-29 13:52:33 +1100
message:
exclude .bzrignore from exports
------------------------------------------------------------
merged: jaq at spacepants.org-20051229024306-e9ab99850c605c5f
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Jamie Wilkinson <jaq at spacepants.org>
branch nick: bzr.dev
timestamp: Thu 2005-12-29 13:43:06 +1100
message:
add blackbox tests for ensuring .bzrignore is not exported
------------------------------------------------------------
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.
More information about the bazaar-commits
mailing list