Rev 2003: Merge bzr.dev. in file:///home/robertc/source/baz/tree-lock/
Robert Collins
robertc at robertcollins.net
Sun Sep 17 22:03:08 BST 2006
------------------------------------------------------------
revno: 2003
revision-id: robertc at robertcollins.net-20060917210304-3a697132f5fb68ac
parent: robertc at robertcollins.net-20060911010359-0404571fa92c5cfe
parent: pqm at pqm.ubuntu.com-20060916140354-1a9932f525bb7182
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bind-does-not-push-or-pull
timestamp: Mon 2006-09-18 07:03:04 +1000
message:
Merge bzr.dev.
added:
bzrlib/inspect_for_copy.py inspect_for_copy.py-20060912223659-9ccpdogzwxqznpq1-1
bzrlib/lazy_import.py lazy_import.py-20060910203832-f77c54gf3n232za0-1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_treebuilder.py test_treebuilder.py-20060907214856-4omn6hf1u7fvrart-2
bzrlib/tests/workingtree_implementations/test_mkdir.py test_mkdir.py-20060907214856-4omn6hf1u7fvrart-3
bzrlib/tests/workingtree_implementations/test_put_file.py test_put_file.py-20060907214856-4omn6hf1u7fvrart-4
bzrlib/transport/smart.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/treebuilder.py treebuilder.py-20060907214856-4omn6hf1u7fvrart-1
doc/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
HACKING HACKING-20050805200004-2a5dc975d870f78c
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
profile_imports.py profile_imports.py-20060618020306-k5uw80achysrokj9-1
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060916140354-1a9932f525bb7182
parent: pqm at pqm.ubuntu.com-20060916022341-3d816fe2ecff52c1
parent: robertc at robertcollins.net-20060916133647-ee5626e6ab413aa4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-16 15:03:54 +0100
message:
(robertc) Add MemoryTree and TreeBuilder test helpers. Also test behavior of transport.has('/') which caused failures in this when merging, and as a result cleanup the sftp path normalisation logic.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060916133647-ee5626e6ab413aa4
parent: pqm at pqm.ubuntu.com-20060916022341-3d816fe2ecff52c1
parent: robertc at robertcollins.net-20060916064447-99a2987e5485b5ea
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-09-16 23:36:47 +1000
message:
(robertc) Add MemoryTree and TreeBuilder test helpers. Also test behavior of transport.has('/') which caused failures in this when merging, and as a result cleanup the sftp path normalisation logic.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060916064447-99a2987e5485b5ea
parent: robertc at robertcollins.net-20060915224602-3b939c8c84018c0d
parent: pqm at pqm.ubuntu.com-20060915233942-f1b47109b9823f89
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Sat 2006-09-16 16:44:47 +1000
message:
Merge from bzr.dev, fixing found bugs handling 'has('/')' in MemoryTransport and SFTP transports.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060915224602-3b939c8c84018c0d
parent: robertc at robertcollins.net-20060915020315-9a4b022a6db42940
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Sat 2006-09-16 08:46:02 +1000
message:
Update to the TreeBuilder tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060915020315-9a4b022a6db42940
parent: robertc at robertcollins.net-20060915012138-7d6fb0a40a980f36
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Fri 2006-09-15 12:03:15 +1000
message:
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060915012138-7d6fb0a40a980f36
parent: robertc at robertcollins.net-20060914032717-1706ea260c3c77c9
parent: andrew.bennetts at canonical.com-20060914080720-e0ad8034add462d6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Fri 2006-09-15 11:21:38 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060914032717-1706ea260c3c77c9
parent: robertc at robertcollins.net-20060907233640-ffbf5a907fd6ba31
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Thu 2006-09-14 13:27:17 +1000
message:
Add MemoryTree.last_revision.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907233640-ffbf5a907fd6ba31
parent: robertc at robertcollins.net-20060907233310-c8d52c742057aff5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Fri 2006-09-08 09:36:40 +1000
message:
Update NEWS.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907233310-c8d52c742057aff5
parent: robertc at robertcollins.net-20060907233128-2602099e86422c10
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Fri 2006-09-08 09:33:10 +1000
message:
Fixup deprecations from bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907233128-2602099e86422c10
parent: robertc at robertcollins.net-20060907231308-fc41d15bb7218fe1
parent: pqm at pqm.ubuntu.com-20060907230608-4f18ec1bbe03eb8f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Fri 2006-09-08 09:31:28 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907231308-fc41d15bb7218fe1
parent: robertc at robertcollins.net-20060906011108-466432bcfcb4eb2b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Fri 2006-09-08 09:13:08 +1000
message:
Various changes to allow non-workingtree specific tests to run entirely
from MemoryTransports:
* Create MemoryTree and pull up common code for it from WorkingTree to
a new common base class MutableTree.
* Add MutableTree.mkdir().
* Add MutableTree.put_file_bytes_nonatomic().
* New test helper make_branch_and_memory_tree().
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060906011108-466432bcfcb4eb2b
parent: pqm at pqm.ubuntu.com-20060905233301-2e69db43982088ae
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Move Repository escaping test into repository_implementations/test_repository.py
timestamp: Wed 2006-09-06 11:11:08 +1000
message:
Move test_branch_on_vfat into a repository implementation test, to ensure that all repository formats are safe on vfat.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060916022341-3d816fe2ecff52c1
parent: pqm at pqm.ubuntu.com-20060916015702-d6561b23f958bfdd
parent: john at arbash-meinel.com-20060916021414-bd9e4cb9ac173022
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-16 03:23:41 +0100
message:
(jam) raise ShortReadvError when we don't get back enough data
------------------------------------------------------------
merged: john at arbash-meinel.com-20060916021414-bd9e4cb9ac173022
parent: john at arbash-meinel.com-20060914190856-746db7da49f34568
parent: pqm at pqm.ubuntu.com-20060916015702-d6561b23f958bfdd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: short_reads
timestamp: Fri 2006-09-15 21:14:14 -0500
message:
[merge] bzr.dev 2016
------------------------------------------------------------
merged: john at arbash-meinel.com-20060914190856-746db7da49f34568
parent: john at arbash-meinel.com-20060912170328-beee785b9e579ac2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: short_reads
timestamp: Thu 2006-09-14 14:08:56 -0500
message:
review feedback: add the actual count written to ShortReadvError
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912170328-beee785b9e579ac2
parent: john at arbash-meinel.com-20060912164248-e56b8c183b6ac6a6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: short_reads
timestamp: Tue 2006-09-12 12:03:28 -0500
message:
Force all transports to raise ShortReadvError if they can
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912164248-e56b8c183b6ac6a6
parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: short_reads
timestamp: Tue 2006-09-12 11:42:48 -0500
message:
Add some assert statements to make readv safe
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060916015702-d6561b23f958bfdd
parent: pqm at pqm.ubuntu.com-20060916014706-93f2994bdb0c0850
parent: john at arbash-meinel.com-20060916003152-b2f60431bce0596d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-16 02:57:02 +0100
message:
(jam) don't use deprecated pending_merges for 'bzr update'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060916003152-b2f60431bce0596d
parent: pqm at pqm.ubuntu.com-20060915233942-f1b47109b9823f89
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: update-deprecated
timestamp: Fri 2006-09-15 19:31:52 -0500
message:
Stop using pending_merges() in 'bzr update'
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060916014706-93f2994bdb0c0850
parent: pqm at pqm.ubuntu.com-20060915233942-f1b47109b9823f89
parent: john at arbash-meinel.com-20060915234816-cbbdb0ad5c77da23
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-16 02:47:06 +0100
message:
(spiv,mpool,robertc) Create a RPC protocol as the building blocks for a smart server
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915234816-cbbdb0ad5c77da23
parent: john at arbash-meinel.com-20060915224610-e2488ffa5c43f20b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: smart-server
timestamp: Fri 2006-09-15 18:48:16 -0500
message:
Translate UnicodeErrors across the smart server
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915224610-e2488ffa5c43f20b
parent: robertc at robertcollins.net-20060915123116-2151853564521d8f
parent: pqm at pqm.ubuntu.com-20060915171438-a30aecb7d5eb20be
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: smart-server
timestamp: Fri 2006-09-15 17:46:10 -0500
message:
[merge] bzr.dev 2013
------------------------------------------------------------
merged: robertc at robertcollins.net-20060915123116-2151853564521d8f
parent: andrew.bennetts at canonical.com-20060915063039-a0488e9077438ecb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: smart-transport
timestamp: Fri 2006-09-15 22:31:16 +1000
message:
Fix up all tests to pass, remove a couple more deprecated function calls, and break the dependency on sftp for the smart transport.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915063039-a0488e9077438ecb
parent: andrew.bennetts at canonical.com-20060915052345-9553e8c30355cefa
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Fri 2006-09-15 16:30:39 +1000
message:
Address various review comments.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915052345-9553e8c30355cefa
parent: andrew.bennetts at canonical.com-20060915051928-f417c710aa907ec4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Fri 2006-09-15 15:23:45 +1000
message:
Activate a disabled test, rename another test to be consistent with what it's testing. (Andrew Bennetts, Robert Collins)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915051928-f417c710aa907ec4
parent: andrew.bennetts at canonical.com-20060915021438-cc11222a2a599231
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Fri 2006-09-15 15:19:28 +1000
message:
General code cleanup based on review comments and other observations.
Specifically, add a test --inet mode to the blackbox serve tests, change \1 to
\x01 for readability, add parameter to SmartTransport allowing provision of a
client, remove the use of deprecated 'put' method, tidy imports and remove
commented dead code. (Andrew Bennetts, Robert Collins)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915021438-cc11222a2a599231
parent: andrew.bennetts at canonical.com-20060913134321-ad198def5d41790e
parent: andrew.bennetts at canonical.com-20060915020456-c4c873ebddd12e21
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Fri 2006-09-15 12:14:38 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913134321-ad198def5d41790e
parent: andrew.bennetts at canonical.com-20060913065325-4ddfffce8d31f00d
parent: andrew.bennetts at canonical.com-20060913133445-eaa7658db73fc7f5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 23:43:21 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913065325-4ddfffce8d31f00d
parent: andrew.bennetts at canonical.com-20060913064503-801bc0a66726de1c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 16:53:25 +1000
message:
Give a sensible error if insufficient options are passed to 'bzr serve'.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913064503-801bc0a66726de1c
parent: andrew.bennetts at canonical.com-20060913064201-39d1deac86fc332b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 16:45:03 +1000
message:
Allow specifying the host/interface to bzr serve, and use the new test
infrastructure to blackbox test bzr serve in listening mode of a local branch.
(Andrew Bennetts, Robert Collins)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913064201-39d1deac86fc332b
parent: andrew.bennetts at canonical.com-20060913055419-2a16c273a7d5169b
parent: andrew.bennetts at canonical.com-20060913064003-968d976096934580
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 16:42:01 +1000
message:
Merge increased transport root tests and fix the smart transport accordingly.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913055419-2a16c273a7d5169b
parent: andrew.bennetts at canonical.com-20060913044833-6d54576583f4d7bd
parent: andrew.bennetts at canonical.com-20060913055352-4d8ccca5a3841600
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 15:54:19 +1000
message:
Merge Start and stop bzr subprocess.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913055352-4d8ccca5a3841600
parent: andrew.bennetts at canonical.com-20060912062231-809104defb0f13d0
parent: andrew.bennetts at canonical.com-20060913055229-a52ae11c2aeaf400
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Smart transport server and client
timestamp: Wed 2006-09-13 15:53:52 +1000
message:
Merge Start and stop bzr subprocess.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913044833-6d54576583f4d7bd
parent: andrew.bennetts at canonical.com-20060913035313-30489d7505552ad9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 14:48:33 +1000
message:
Add a doc on "Running a Bazaar Server" (Robert Collins, Andrew Bennetts)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913035313-30489d7505552ad9
parent: andrew.bennetts at canonical.com-20060912064751-6a7029b08372ee0e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Wed 2006-09-13 13:53:13 +1000
message:
Add SSH support.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060912064751-6a7029b08372ee0e
parent: andrew.bennetts at canonical.com-20060912062231-809104defb0f13d0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: add get_smart_client
timestamp: Tue 2006-09-12 16:47:51 +1000
message:
Add a new method ``Transport.get_smart_client()``. This is provided to allow
upgrades to a richer interface than the VFS one provided by Transport. (Andrew
Bennetts, Martin Pool)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060912062231-809104defb0f13d0
parent: andrew.bennetts at canonical.com-20060831092407-423d4b5b4b55c473
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Smart transport server and client
timestamp: Tue 2006-09-12 16:22:31 +1000
message:
Support bzr:// urls to work with the new RPC-based transport which will be used
with the upcoming high-performance smart server. The new command ``bzr serve``
will invoke bzr in server mode, which processes these requests. (Andrew
Bennetts, Robert Collins, Martin Pool)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060915233942-f1b47109b9823f89
parent: pqm at pqm.ubuntu.com-20060915171438-a30aecb7d5eb20be
parent: john at arbash-meinel.com-20060915222344-32f6da8f7538adc2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-16 00:39:42 +0100
message:
(spiv,jam) fallback to Paramiko if ssh is not available
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915222344-32f6da8f7538adc2
parent: john at arbash-meinel.com-20060915221819-f3e636f08d2ea3f2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fix-sftp-vendor
timestamp: Fri 2006-09-15 17:23:44 -0500
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915221819-f3e636f08d2ea3f2
parent: john at arbash-meinel.com-20060915220519-e6d4da0d2a1f8791
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fix-sftp-vendor
timestamp: Fri 2006-09-15 17:18:19 -0500
message:
Add a test that we can always fall back to the paramiko vendor
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915220519-e6d4da0d2a1f8791
parent: pqm at pqm.ubuntu.com-20060915171438-a30aecb7d5eb20be
parent: andrew.bennetts at canonical.com-20060913124446-28405a99e41eae49
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fix-sftp-vendor
timestamp: Fri 2006-09-15 17:05:19 -0500
message:
[merge] Andrew Bennetts: fixes for _get_ssh_vendor()
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913124446-28405a99e41eae49
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr-ssh-fixes
timestamp: Wed 2006-09-13 22:44:46 +1000
message:
Fix NameError reported by Alexander Belchenko.
This also fixes some other nits so that pyflakes now gives completely
clean output for sftp.py and ssh.py.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060915171438-a30aecb7d5eb20be
parent: pqm at pqm.ubuntu.com-20060915031026-bc8ed55c218d9d30
parent: john at arbash-meinel.com-20060914192015-c1ec551d8f12bc7e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-15 18:14:38 +0100
message:
(jam,moy) skip tests when dependencies aren't available
------------------------------------------------------------
merged: john at arbash-meinel.com-20060914192015-c1ec551d8f12bc7e
parent: john at arbash-meinel.com-20060914191856-dfdf8d312ba5c0e3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test-setup-skip
timestamp: Thu 2006-09-14 14:20:15 -0500
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060914191856-dfdf8d312ba5c0e3
parent: john at arbash-meinel.com-20060909155154-b14e5e0f5e827bc6
parent: Matthieu.Moy at imag.fr-20060909164309-4fdfb7759964c51b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test-setup-skip
timestamp: Thu 2006-09-14 14:18:56 -0500
message:
[merge] Matthieu Moy: updates to skipping setup.py test
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060909164309-4fdfb7759964c51b
parent: Matthieu.Moy at imag.fr-20060909162811-116ee7c027bdb073
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.skip-test-setup
timestamp: Sat 2006-09-09 18:43:09 +0200
message:
Test for the presence of the Makefile
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060909162811-116ee7c027bdb073
parent: pqm at pqm.ubuntu.com-20060909160418-376f106672f0163b
parent: john at arbash-meinel.com-20060909155154-b14e5e0f5e827bc6
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.skip-test-setup
timestamp: Sat 2006-09-09 18:28:11 +0200
message:
jam's first try
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909155154-b14e5e0f5e827bc6
parent: john at arbash-meinel.com-20060909155019-0ea9be294a2a0ca3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test-setup-skip
timestamp: Sat 2006-09-09 10:51:54 -0500
message:
Skip tests that require paramiko (or think they do)
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909155019-0ea9be294a2a0ca3
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test-setup-skip
timestamp: Sat 2006-09-09 10:50:19 -0500
message:
Skip the setup tests if they don't have distutils.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060915031026-bc8ed55c218d9d30
parent: pqm at pqm.ubuntu.com-20060915023821-c5c8891c3a7fc98f
parent: andrew.bennetts at canonical.com-20060915020456-c4c873ebddd12e21
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-15 04:10:26 +0100
message:
(Andrew Bennetts, Robert Collins) Create a new test helper start_bzr_subprocess which is paired with finish_bzr_subprocess, allowing tests that need to interact with the upcoming bzr serve command.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915020456-c4c873ebddd12e21
parent: andrew.bennetts at canonical.com-20060915015604-7a2c896892577c63
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Fri 2006-09-15 12:04:56 +1000
message:
Add skip_if_plan_to_signal flag to start_bzr_subprocess.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915015604-7a2c896892577c63
parent: andrew.bennetts at canonical.com-20060915012539-34efe857110f4ffc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Fri 2006-09-15 11:56:04 +1000
message:
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915012539-34efe857110f4ffc
parent: andrew.bennetts at canonical.com-20060915010327-9a82c824fe58fc00
parent: andrew.bennetts at canonical.com-20060915012525-bb256f71ab834d8e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Fri 2006-09-15 11:25:39 +1000
message:
Merge from extra transport tests
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915010327-9a82c824fe58fc00
parent: andrew.bennetts at canonical.com-20060915005252-ef68d419511c6c73
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Fri 2006-09-15 11:03:27 +1000
message:
Use sys.stdout consistently, rather than mixed with print.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915005252-ef68d419511c6c73
parent: andrew.bennetts at canonical.com-20060913133445-eaa7658db73fc7f5
parent: andrew.bennetts at canonical.com-20060915004512-cf284e0c2b322cbe
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Fri 2006-09-15 10:52:52 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913133445-eaa7658db73fc7f5
parent: andrew.bennetts at canonical.com-20060913064003-968d976096934580
parent: andrew.bennetts at canonical.com-20060913132246-aa988489fa35ced1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Wed 2006-09-13 23:34:45 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913132246-aa988489fa35ced1
parent: andrew.bennetts at canonical.com-20060913063941-1e7b414d49483248
parent: andrew.bennetts at canonical.com-20060913125639-bfa6af442ed809f8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: TestCaseWithTransport.get_url fix
timestamp: Wed 2006-09-13 23:22:46 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913064003-968d976096934580
parent: andrew.bennetts at canonical.com-20060913055229-a52ae11c2aeaf400
parent: andrew.bennetts at canonical.com-20060913063941-1e7b414d49483248
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Wed 2006-09-13 16:40:03 +1000
message:
Merge increased transport root tests.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913063941-1e7b414d49483248
parent: andrew.bennetts at canonical.com-20060831092407-423d4b5b4b55c473
parent: andrew.bennetts at canonical.com-20060913063931-b851195967dd5228
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: TestCaseWithTransport.get_url fix
timestamp: Wed 2006-09-13 16:39:41 +1000
message:
Merge increased transport root tests.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913055229-a52ae11c2aeaf400
parent: andrew.bennetts at canonical.com-20060831092407-423d4b5b4b55c473
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Start and stop bzr subprocess
timestamp: Wed 2006-09-13 15:52:29 +1000
message:
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue
running concurrently with a subprocess of bzr. (Andrew Bennetts, Robert Collins)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060831092407-423d4b5b4b55c473
parent: andrew.bennetts at canonical.com-20060830065456-5e8aa8849b4c1f62
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: TestCaseWithTransport.get_url fix
timestamp: Thu 2006-08-31 19:24:07 +1000
message:
Change TestCaseWithTransport.get_url so that test_add_in_nonascii_branch passes.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060915023821-c5c8891c3a7fc98f
parent: pqm at pqm.ubuntu.com-20060915013127-9c6755fb4c48456e
parent: andrew.bennetts at canonical.com-20060915012525-bb256f71ab834d8e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-15 03:38:21 +0100
message:
(Martin Pool) Make it optional for transports to implement lock_read and lock_write by testing that they either work or raise TransportNotPossible.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915012525-bb256f71ab834d8e
parent: andrew.bennetts at canonical.com-20060915004512-cf284e0c2b322cbe
parent: andrew.bennetts at canonical.com-20060915011218-5f4e09a259ddc492
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Fri 2006-09-15 11:25:25 +1000
message:
Merge from extra transport tests
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915004512-cf284e0c2b322cbe
parent: andrew.bennetts at canonical.com-20060915003856-698df72c7e9cf2b0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Fri 2006-09-15 10:45:12 +1000
message:
Update Transport.abspath docstring.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915003856-698df72c7e9cf2b0
parent: andrew.bennetts at canonical.com-20060913125639-bfa6af442ed809f8
parent: andrew.bennetts at canonical.com-20060914130757-38850764ef32527a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Fri 2006-09-15 10:38:56 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913125639-bfa6af442ed809f8
parent: andrew.bennetts at canonical.com-20060913063931-b851195967dd5228
parent: andrew.bennetts at canonical.com-20060913123247-48b9c5e047010a4d
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Wed 2006-09-13 22:56:39 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913063931-b851195967dd5228
parent: andrew.bennetts at canonical.com-20060830065456-5e8aa8849b4c1f62
parent: andrew.bennetts at canonical.com-20060913063844-e2447669d3b9d7ad
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Wed 2006-09-13 16:39:31 +1000
message:
Merge increased transport root tests.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830065456-5e8aa8849b4c1f62
parent: andrew.bennetts at canonical.com-20060830063450-82e8f60ce2bc67fc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Wed 2006-08-30 16:54:56 +1000
message:
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830063450-82e8f60ce2bc67fc
parent: andrew.bennetts at canonical.com-20060830061959-266b78fcec4a603f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: lock_read/lock_write raise TransportNotPossible
timestamp: Wed 2006-08-30 16:34:50 +1000
message:
lock_read and lock_write may raise TransportNotPossible.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060915013127-9c6755fb4c48456e
parent: pqm at pqm.ubuntu.com-20060914085936-0fb09526ebcf67d2
parent: andrew.bennetts at canonical.com-20060915011218-5f4e09a259ddc492
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-15 02:31:27 +0100
message:
(Andrew Bennetts, Robert Collins, Martin Pool) Ensure consistent behaviour at the root of transports for clone/abspath.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060915011218-5f4e09a259ddc492
parent: andrew.bennetts at canonical.com-20060914130757-38850764ef32527a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Fri 2006-09-15 11:12:18 +1000
message:
Fix the FTP transport's handling of abspath('/')
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914130757-38850764ef32527a
parent: andrew.bennetts at canonical.com-20060914074125-53a230e52cd76c31
parent: andrew.bennetts at canonical.com-20060914080720-e0ad8034add462d6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Thu 2006-09-14 23:07:57 +1000
message:
Merge from preserve transport when creating bzrdir
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914074125-53a230e52cd76c31
parent: andrew.bennetts at canonical.com-20060914071239-caffd8e71f43ec4b
parent: andrew.bennetts at canonical.com-20060914074113-2a1ac195e4b0888e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Thu 2006-09-14 17:41:25 +1000
message:
Merge from BzrNewError.__str__
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914074113-2a1ac195e4b0888e
parent: andrew.bennetts at canonical.com-20060914060905-b28f666b4ad2ec0b
parent: andrew.bennetts at canonical.com-20060914072340-9163d614bf1df7a5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: workingtree creation bug fix.
timestamp: Thu 2006-09-14 17:41:13 +1000
message:
Merge from BzrNewError.__str__
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914071239-caffd8e71f43ec4b
parent: andrew.bennetts at canonical.com-20060914062800-033348f8dbfb3db1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Thu 2006-09-14 17:12:39 +1000
message:
Put url in 'invalid port number' message on a new line.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914062800-033348f8dbfb3db1
parent: andrew.bennetts at canonical.com-20060913123247-48b9c5e047010a4d
parent: andrew.bennetts at canonical.com-20060914060905-b28f666b4ad2ec0b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Thu 2006-09-14 16:28:00 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914060905-b28f666b4ad2ec0b
parent: andrew.bennetts at canonical.com-20060913120713-8dfa23177c7ba128
parent: andrew.bennetts at canonical.com-20060914060341-616d267e38f89349
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: workingtree creation bug fix.
timestamp: Thu 2006-09-14 16:09:05 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913123247-48b9c5e047010a4d
parent: andrew.bennetts at canonical.com-20060913063844-e2447669d3b9d7ad
parent: andrew.bennetts at canonical.com-20060913120713-8dfa23177c7ba128
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Wed 2006-09-13 22:32:47 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913063844-e2447669d3b9d7ad
parent: andrew.bennetts at canonical.com-20060830061959-266b78fcec4a603f
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Wed 2006-09-13 16:38:44 +1000
message:
Transport behaviour at the root of the URL is now defined and tested.
(Andrew Bennetts, Robert Collins)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830061959-266b78fcec4a603f
parent: andrew.bennetts at canonical.com-20060830055126-c5217a1ab701d0ae
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Wed 2006-08-30 16:19:59 +1000
message:
Make SFTPTransport._remote_path do the right thing with absolute paths (and thus make it pass tests.)
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830055126-c5217a1ab701d0ae
parent: andrew.bennetts at canonical.com-20060830053114-cf8a726b4c99a401
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Wed 2006-08-30 15:51:26 +1000
message:
Make memory transport pass tests.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830053114-cf8a726b4c99a401
parent: andrew.bennetts at canonical.com-20060830051859-0a29e4526c6c7ab1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Wed 2006-08-30 15:31:14 +1000
message:
Fix SFTPTransport to pass the new abspath tests.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830051859-0a29e4526c6c7ab1
parent: andrew.bennetts at canonical.com-20060830025300-8157f78673676a55
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: extra transport tests
timestamp: Wed 2006-08-30 15:18:59 +1000
message:
More tests for abspath and clone behaviour
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060914085936-0fb09526ebcf67d2
parent: pqm at pqm.ubuntu.com-20060914061322-e7009c1bca0f6df8
parent: andrew.bennetts at canonical.com-20060914080720-e0ad8034add462d6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-14 09:59:36 +0100
message:
(Andrew Bennetts, Robert Collins, Martin Pool) Allow make_bzrdir on TestCaseWithTransport to create it correctly on all transports, allowing directory formats that require a non-local transport to be testable.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914080720-e0ad8034add462d6
parent: andrew.bennetts at canonical.com-20060914072340-9163d614bf1df7a5
parent: andrew.bennetts at canonical.com-20060913120713-8dfa23177c7ba128
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Thu 2006-09-14 18:07:20 +1000
message:
Merge from workingtree-creation-bug-fix.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913120713-8dfa23177c7ba128
parent: andrew.bennetts at canonical.com-20060830025300-8157f78673676a55
parent: andrew.bennetts at canonical.com-20060913120233-a3b6a97c1d56c7ab
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: workingtree creation bug fix.
timestamp: Wed 2006-09-13 22:07:13 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830025300-8157f78673676a55
parent: andrew.bennetts at canonical.com-20060830024447-7faafe45c8018857
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: workingtree creation bug fix.
timestamp: Wed 2006-08-30 12:53:00 +1000
message:
Fix to make_branch_and_tree's behavior when used with an sftp transport.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914072340-9163d614bf1df7a5
parent: andrew.bennetts at canonical.com-20060914060341-616d267e38f89349
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Thu 2006-09-14 17:23:40 +1000
message:
Fix TestCaseWithTransport.get_url so that e.g. test_nonascii passes.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914060341-616d267e38f89349
parent: andrew.bennetts at canonical.com-20060914060017-b25dbda5594e8358
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Thu 2006-09-14 16:03:41 +1000
message:
Do slightly less splitting.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914060017-b25dbda5594e8358
parent: andrew.bennetts at canonical.com-20060913120233-a3b6a97c1d56c7ab
parent: andrew.bennetts at canonical.com-20060914055128-ce1a13335dbb3663
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Thu 2006-09-14 16:00:17 +1000
message:
Merge from BzrNewError.__str__
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913120233-a3b6a97c1d56c7ab
parent: andrew.bennetts at canonical.com-20060830024447-7faafe45c8018857
parent: andrew.bennetts at canonical.com-20060913113149-e50e3da90823fc47
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Wed 2006-09-13 22:02:33 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830024447-7faafe45c8018857
parent: andrew.bennetts at canonical.com-20060830023336-5f83ffbce98c0c64
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: preserve transport when creating bzrdir
timestamp: Wed 2006-08-30 12:44:47 +1000
message:
Make make_bzrdir preserve the transport.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060914061322-e7009c1bca0f6df8
parent: pqm at pqm.ubuntu.com-20060914054513-56edb058a4b64088
parent: andrew.bennetts at canonical.com-20060914055128-ce1a13335dbb3663
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-14 07:13:22 +0100
message:
(Andrew Bennetts, Robert Collins, Martin Pool) Make BzrNewError more robust against usage bugs - catch TypeError for badly type format strings.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914055128-ce1a13335dbb3663
parent: andrew.bennetts at canonical.com-20060914053504-9f8e96a89223d392
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: BzrNewError.__str__
timestamp: Thu 2006-09-14 15:51:28 +1000
message:
Add test for BzrNewError.__str__ error handling.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914053504-9f8e96a89223d392
parent: andrew.bennetts at canonical.com-20060913113149-e50e3da90823fc47
parent: andrew.bennetts at canonical.com-20060914045530-504386af0d074c2e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: BzrNewError.__str__
timestamp: Thu 2006-09-14 15:35:04 +1000
message:
Merge from cosmetic.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913113149-e50e3da90823fc47
parent: andrew.bennetts at canonical.com-20060830023336-5f83ffbce98c0c64
parent: andrew.bennetts at canonical.com-20060913111406-5948c590279949c3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: BzrNewError.__str__
timestamp: Wed 2006-09-13 21:31:49 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060830023336-5f83ffbce98c0c64
parent: andrew.bennetts at canonical.com-20060829081622-bf61f64bcae7b67c
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: BzrNewError.__str__
timestamp: Wed 2006-08-30 12:33:36 +1000
message:
Catch TypeError in BzrNewError.__str__, and print more information if an exception happens in that.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060914054513-56edb058a4b64088
parent: pqm at pqm.ubuntu.com-20060914050813-98851d72ff5fc45a
parent: andrew.bennetts at canonical.com-20060914045530-504386af0d074c2e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-14 06:45:13 +0100
message:
(Andrew Bennetts, Robert Collins, Martin Pool) Refactor BzrDir.open and BzrDir.open_containing_from_transport to use a single common helper open_from_transport.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914045530-504386af0d074c2e
parent: andrew.bennetts at canonical.com-20060914045520-ad0a186e90e01a13
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Thu 2006-09-14 14:55:30 +1000
message:
Add tests for BzrDir.open_from_transport.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914045520-ad0a186e90e01a13
parent: andrew.bennetts at canonical.com-20060914041819-eb8fbadb197a39d3
parent: andrew.bennetts at canonical.com-20060914043845-e00b4cbb19ef8442
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Thu 2006-09-14 14:55:20 +1000
message:
Merge from cosmetic
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914041819-eb8fbadb197a39d3
parent: andrew.bennetts at canonical.com-20060913111406-5948c590279949c3
parent: andrew.bennetts at canonical.com-20060914041448-b283087c65c19a8a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Thu 2006-09-14 14:18:19 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913111406-5948c590279949c3
parent: andrew.bennetts at canonical.com-20060829081622-bf61f64bcae7b67c
parent: andrew.bennetts at canonical.com-20060913105126-f67427690b700b48
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Wed 2006-09-13 21:14:06 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060829081622-bf61f64bcae7b67c
parent: andrew.bennetts at canonical.com-20060829081253-c55c0ddc482231a0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: open_from_transport
timestamp: Tue 2006-08-29 18:16:22 +1000
message:
Add BzrDir.open_from_transport, refactored from duplicate code, no explicit tests.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060914050813-98851d72ff5fc45a
parent: pqm at pqm.ubuntu.com-20060914045315-d646c86b3f4722f2
parent: andrew.bennetts at canonical.com-20060914043845-e00b4cbb19ef8442
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-14 06:08:13 +0100
message:
(Andrew Bennetts, Robert Collins) sort the output of listdir in add.py, so that adds are in lexographic order, not filesystem order.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914043845-e00b4cbb19ef8442
parent: andrew.bennetts at canonical.com-20060914041448-b283087c65c19a8a
parent: andrew.bennetts at canonical.com-20060914043322-b4bb1dc5b6655cf1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sort os.listdir in add.py
timestamp: Thu 2006-09-14 14:38:45 +1000
message:
Merge from cosmetic.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914041448-b283087c65c19a8a
parent: andrew.bennetts at canonical.com-20060913105126-f67427690b700b48
parent: andrew.bennetts at canonical.com-20060914041040-531ddb8fbe9787f4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sort os.listdir in add.py
timestamp: Thu 2006-09-14 14:14:48 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913105126-f67427690b700b48
parent: andrew.bennetts at canonical.com-20060912063001-7f832d0244311ed5
parent: andrew.bennetts at canonical.com-20060913103603-48b8cf5e2c7a463a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sort os.listdir in add.py
timestamp: Wed 2006-09-13 20:51:26 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060912063001-7f832d0244311ed5
parent: andrew.bennetts at canonical.com-20060829081253-c55c0ddc482231a0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sort os.listdir in add.py
timestamp: Tue 2006-09-12 16:30:01 +1000
message:
Sort os.listdir results in add.py.
Some filesystems (like ext3 with the 'dir_index' option set) don't necessarily
return directory listings in alphabetical order, contrary to what some tests
assume.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060914045315-d646c86b3f4722f2
parent: pqm at pqm.ubuntu.com-20060913022700-feca914a6d5495f2
parent: andrew.bennetts at canonical.com-20060914043322-b4bb1dc5b6655cf1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-14 05:53:15 +0100
message:
(Andrew Bennetts, Robert Collins, Martin Pool) Various cosmetic improvements to docstrings and comments throughout bzrlib.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914043322-b4bb1dc5b6655cf1
parent: andrew.bennetts at canonical.com-20060914041040-531ddb8fbe9787f4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Thu 2006-09-14 14:33:22 +1000
message:
Re-instate copy import, which is actually needed.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914041040-531ddb8fbe9787f4
parent: andrew.bennetts at canonical.com-20060914032814-6817446cff1ee398
parent: pqm at pqm.ubuntu.com-20060913022700-feca914a6d5495f2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Thu 2006-09-14 14:10:40 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060914032814-6817446cff1ee398
parent: andrew.bennetts at canonical.com-20060913103603-48b8cf5e2c7a463a
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Thu 2006-09-14 13:28:14 +1000
message:
Expand comment about lock_read/lock_write.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913103603-48b8cf5e2c7a463a
parent: andrew.bennetts at canonical.com-20060829081253-c55c0ddc482231a0
parent: andrew.bennetts at canonical.com-20060913100310-05b757fd7ec1ecbd
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Wed 2006-09-13 20:36:03 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913100310-05b757fd7ec1ecbd
parent: andrew.bennetts at canonical.com-20060829013108-eee0301e190437aa
parent: andrew.bennetts at canonical.com-20060913094056-b311a460a4fca603
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: list_dir return type
timestamp: Wed 2006-09-13 20:03:10 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060913094056-b311a460a4fca603
parent: andrew.bennetts at canonical.com-20060829012540-e6285c443460fa06
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: sftp refactoring 2
timestamp: Wed 2006-09-13 19:40:56 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060829081253-c55c0ddc482231a0
parent: andrew.bennetts at canonical.com-20060829013108-eee0301e190437aa
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: cosmetic
timestamp: Tue 2006-08-29 18:12:53 +1000
message:
Various cosmetic changes.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060913022700-feca914a6d5495f2
parent: pqm at pqm.ubuntu.com-20060912235634-1c39364c1566488a
parent: john at arbash-meinel.com-20060913021602-3a0be26095515136
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-13 03:27:00 +0100
message:
(jam) lazy_import module allows on-demand loading of objects, can help startup time
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913021602-3a0be26095515136
parent: john at arbash-meinel.com-20060913020937-2df2f49f9a28ec43
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 21:16:02 -0500
message:
Add a test for side-effects from using ScopeReplacer
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913020937-2df2f49f9a28ec43
parent: john at arbash-meinel.com-20060913015742-26daf2a7676b904e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 21:09:37 -0500
message:
Update HACKING and docstrings
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913015742-26daf2a7676b904e
parent: john at arbash-meinel.com-20060913015231-b2d4a34beacbd0c0
parent: pqm at pqm.ubuntu.com-20060912235634-1c39364c1566488a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 20:57:42 -0500
message:
[merge] bzr.dev 2003
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913015231-b2d4a34beacbd0c0
parent: john at arbash-meinel.com-20060912231013-10a9f5573a3bae44
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 20:52:31 -0500
message:
cherry-pick the inspect_for_copy changes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912231013-10a9f5573a3bae44
parent: john at arbash-meinel.com-20060912220202-36e9c6beb4113b05
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 18:10:13 -0500
message:
Clean up comment as suggested by Robert
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912220202-36e9c6beb4113b05
parent: john at arbash-meinel.com-20060912203631-00b158854d709a81
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 17:02:02 -0500
message:
Update --profile-imports to support the new lazy_import code
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912203631-00b158854d709a81
parent: john at arbash-meinel.com-20060912193702-22c752299731a663
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 15:36:31 -0500
message:
fix typo
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912193702-22c752299731a663
parent: john at arbash-meinel.com-20060912190727-35ae1dff7a95b789
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 14:37:02 -0500
message:
HACKING and NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912190727-35ae1dff7a95b789
parent: john at arbash-meinel.com-20060912184249-83efc58bcc327550
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 14:07:27 -0500
message:
Write a simple wrapper function to make lazy imports easy.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912184249-83efc58bcc327550
parent: john at arbash-meinel.com-20060912173452-ef9e20b8a52ec3e6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 13:42:49 -0500
message:
Add more structured error handling
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912173452-ef9e20b8a52ec3e6
parent: john at arbash-meinel.com-20060912173323-112d28652516fd94
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 12:34:52 -0500
message:
Small cleanup
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912173323-112d28652516fd94
parent: john at arbash-meinel.com-20060912003109-ac4e59e3a2acee16
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Tue 2006-09-12 12:33:23 -0500
message:
Raise an exception when ScopeReplacer has been misused
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912003109-ac4e59e3a2acee16
parent: john at arbash-meinel.com-20060911232801-d7930bab42c6a81d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 19:31:09 -0500
message:
Everything is now hooked up
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911232801-d7930bab42c6a81d
parent: john at arbash-meinel.com-20060911225535-b20aae01acc390b8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 18:28:01 -0500
message:
Add tests for converting from a string to the final map
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911225535-b20aae01acc390b8
parent: john at arbash-meinel.com-20060911224857-d7008be21aeee33e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 17:55:35 -0500
message:
small test updates
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911224857-d7008be21aeee33e
parent: john at arbash-meinel.com-20060911224313-dbd20de5b9c8f5eb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 17:48:57 -0500
message:
Switch from individual functions to a class
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911224313-dbd20de5b9c8f5eb
parent: john at arbash-meinel.com-20060911220906-41ee1e306aad0464
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 17:43:13 -0500
message:
Test the ability to take a bunch of import lines and canonicalize them
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911220906-41ee1e306aad0464
parent: john at arbash-meinel.com-20060911215626-0bbe834149b22b07
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 17:09:06 -0500
message:
Handle 'from foo import bar' syntax
This includes:
from foo import bar
from foo import bar, baz
from foo import bar as bing, baz as bar
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911215626-0bbe834149b22b07
parent: john at arbash-meinel.com-20060911205344-177a893284ee9ff7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 16:56:26 -0500
message:
Create a method for handling 'import *' syntax.
This handles:
import foo
import foo.bar
import foo.bar as baz
import foo, foo.bar, baz.bing
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911205344-177a893284ee9ff7
parent: john at arbash-meinel.com-20060911205155-e86e48e3fa709e7f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 15:53:44 -0500
message:
Split up TestImportReplacer into a helper class
Getting ready to test a simple import line parser.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911205155-e86e48e3fa709e7f
parent: john at arbash-meinel.com-20060911201045-2a703743d89ce392
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 15:51:55 -0500
message:
Test a nested import with multiple deep children
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911201045-2a703743d89ce392
parent: john at arbash-meinel.com-20060911200350-e4f917892ea062f2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 15:10:45 -0500
message:
Test that we can add more children to the existing lazy object
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911200350-e4f917892ea062f2
parent: john at arbash-meinel.com-20060911195518-1a2bc78a3ab51ba9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 15:03:50 -0500
message:
Test that we can lazy import a module, and its children
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911195518-1a2bc78a3ab51ba9
parent: john at arbash-meinel.com-20060910212031-13eaac6b8e5a1f7b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Mon 2006-09-11 14:55:18 -0500
message:
Change how parameters are passed to support 'import root1.mod1 as mod1'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060910212031-13eaac6b8e5a1f7b
parent: john at arbash-meinel.com-20060910205901-ceb5929c1497f81f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Sun 2006-09-10 16:20:31 -0500
message:
Basic single-level imports work
------------------------------------------------------------
merged: john at arbash-meinel.com-20060910205901-ceb5929c1497f81f
parent: john at arbash-meinel.com-20060910203926-ae731f6bb165d6fa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Sun 2006-09-10 15:59:01 -0500
message:
start working on some lazy importing code
------------------------------------------------------------
merged: john at arbash-meinel.com-20060910203926-ae731f6bb165d6fa
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_importer
timestamp: Sun 2006-09-10 15:39:26 -0500
message:
Adding a ScopeReplacer class, which can replace itself on demand
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060912235634-1c39364c1566488a
parent: pqm at pqm.ubuntu.com-20060912225150-4e223573354de097
parent: john at arbash-meinel.com-20060912225807-ce62ca758f3dab56
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-13 00:56:34 +0100
message:
(jam) add more verbose logging when run_bzr_subprocess fails
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912225807-ce62ca758f3dab56
parent: pqm at pqm.ubuntu.com-20060912225150-4e223573354de097
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 17:58:07 -0500
message:
Add more verbose output when run_bzr_subprocess fails
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060912225150-4e223573354de097
parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
parent: john at arbash-meinel.com-20060912220526-9d06572ba24012d8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-12 23:51:50 +0100
message:
merge bzr-0.10 into bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912220526-9d06572ba24012d8
parent: john at arbash-meinel.com-20060912215631-b827909408542a9b
parent: jelmer at samba.org-20060912212501-350ff35ed68bc2fb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 17:05:26 -0500
message:
[merge] typo fix from Jelmer
------------------------------------------------------------
merged: jelmer at samba.org-20060912212501-350ff35ed68bc2fb
parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2006-09-12 21:25:01 +0000
message:
Fix typo in encoding warning.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912215631-b827909408542a9b
parent: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
parent: pqm at pqm.ubuntu.com-20060904005919-d595cc974f859400
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 16:56:31 -0500
message:
merge bzr-0.10 into bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060904005919-d595cc974f859400
parent: pqm at pqm.ubuntu.com-20060829010426-0688b3338fbc2925
parent: robertc at robertcollins.net-20060904004738-8c584f1f41fe19d3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.10
timestamp: Mon 2006-09-04 01:59:19 +0100
message:
(robertc) Turn bzr 0.10rc2 into 0.10 final.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060904004738-8c584f1f41fe19d3
parent: pqm at pqm.ubuntu.com-20060829010426-0688b3338fbc2925
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.10
timestamp: Mon 2006-09-04 10:47:38 +1000
message:
(robertc) Turn bzr 0.10rc2 into 0.10 final.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060829010426-0688b3338fbc2925
parent: pqm at pqm.ubuntu.com-20060828011724-4ee7f77cc8a97a64
parent: robertc at robertcollins.net-20060829005214-595a26f2a2188d58
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.10
timestamp: Tue 2006-08-29 02:04:26 +0100
message:
The bzr selftest was failing on installed versions due to a bug in a new
------------------------------------------------------------
merged: robertc at robertcollins.net-20060829005214-595a26f2a2188d58
parent: pqm at pqm.ubuntu.com-20060828011724-4ee7f77cc8a97a64
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.10
timestamp: Tue 2006-08-29 10:52:14 +1000
message:
The bzr selftest was failing on installed versions due to a bug in a new
test helper. (John Arbash Meinel, Robert Collins, #58057)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060828011724-4ee7f77cc8a97a64
parent: pqm at pqm.ubuntu.com-20060826132727-76ef12b67201fbf8
parent: robertc at robertcollins.net-20060828010333-9cc845dca3dcd015
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.10
timestamp: Mon 2006-08-28 02:17:24 +0100
message:
(robertc) Update version strings for 0.10rc1.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060828010333-9cc845dca3dcd015
parent: pqm at pqm.ubuntu.com-20060826132727-76ef12b67201fbf8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.10
timestamp: Mon 2006-08-28 11:03:33 +1000
message:
Update version strings for 0.10rc1.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060912153932-5ad746328277317a
parent: pqm at pqm.ubuntu.com-20060912014025-49963eb2d73c6827
parent: john at arbash-meinel.com-20060912152907-f6f310a88437b17f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-12 16:39:32 +0100
message:
(vila) Fix bug #59835: avoid e.code for URLErrors
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912152907-f6f310a88437b17f
parent: john at arbash-meinel.com-20060912152802-64ced185121942af
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 10:29:07 -0500
message:
NEWS for fixing bug #59835
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912152802-64ced185121942af
parent: john at arbash-meinel.com-20060912152325-08f75e88cc926c77
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 10:28:02 -0500
message:
Update the urllib.has test.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912152325-08f75e88cc926c77
parent: pqm at pqm.ubuntu.com-20060912014025-49963eb2d73c6827
parent: v.ladeuil+lp at free.fr-20060912105446-b2acda6c722bcda9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-09-12 10:23:25 -0500
message:
[merge] vila: fix bug #59835 with test
------------------------------------------------------------
merged: v.ladeuil+lp at free.fr-20060912105446-b2acda6c722bcda9
parent: pqm at pqm.ubuntu.com-20060912014025-49963eb2d73c6827
committer: v.ladeuil+lp at free.fr
branch nick: bug.59835
timestamp: Tue 2006-09-12 12:54:46 +0200
message:
Fix bug 59835 with test.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.has): Only HTTPError have a 'code'
attribute. Separate them from URLError exceptions.
* bzrlib/tests/test_http.py:
(TestHttpConnections_urllib.test_bogus_host): Check that an
URLError can be raised safely.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060912014025-49963eb2d73c6827
parent: pqm at pqm.ubuntu.com-20060911165531-9e9b9a022a53fef5
parent: robertc at robertcollins.net-20060910235657-56a542e8af8f28de
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-12 02:40:25 +0100
message:
(robertc) Partial fix for bug #39542 - allow lightweight checkouts over http.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060911165531-9e9b9a022a53fef5
parent: pqm at pqm.ubuntu.com-20060911152532-3762ad5c8c6c98dd
parent: john at arbash-meinel.com-20060911162245-225331216fd26a9f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-11 17:55:31 +0100
message:
(moy) fixes for revno:N:branch/path
------------------------------------------------------------
merged: john at arbash-meinel.com-20060911162245-225331216fd26a9f
parent: pqm at pqm.ubuntu.com-20060911152532-3762ad5c8c6c98dd
parent: Matthieu.Moy at imag.fr-20060911093451-24ef653833ff7477
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2006-09-11 11:22:45 -0500
message:
(moy) fixes for revno:N:branch/path
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911093451-24ef653833ff7477
parent: Matthieu.Moy at imag.fr-20060911083310-6fb1c822a556e34b
parent: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 11:34:51 +0200
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911083310-6fb1c822a556e34b
parent: Matthieu.Moy at imag.fr-20060911082714-7efc23fff2d862c4
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 14:03:10 +0530
message:
Better testcase for revno:N:branch/path error.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911082714-7efc23fff2d862c4
parent: Matthieu.Moy at imag.fr-20060911075850-dac85ac1c8d9f022
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 13:57:14 +0530
message:
Made merge work with two revisions in different branches.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911075850-dac85ac1c8d9f022
parent: Matthieu.Moy at imag.fr-20060911060702-e9ba0bad0fb3b443
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 13:28:50 +0530
message:
Canceled an incorrect "path = None".
Indeed, the "path" problem is managed in the revisionspec for revno:N:branch/path.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060911060702-e9ba0bad0fb3b443
parent: Matthieu.Moy at imag.fr-20060903155815-9009ac7d567b0c2a
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-09-11 11:37:02 +0530
message:
Cut long lines, prevent "path" component from being used in revno:branch/path.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060903155815-9009ac7d567b0c2a
parent: Matthieu.Moy at imag.fr-20060903155603-5967ff3f7b648291
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-09-03 21:28:15 +0530
message:
missing newline
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060903155603-5967ff3f7b648291
parent: Matthieu.Moy at imag.fr-20060828064741-53102882e33ab249
parent: pqm at pqm.ubuntu.com-20060901173735-543e9acad03760d1
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-09-03 21:26:03 +0530
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060828064741-53102882e33ab249
parent: Matthieu.Moy at imag.fr-20060812135610-34e8ad03d56d38ad
parent: pqm at pqm.ubuntu.com-20060828012417-06e65a27028c9476
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Mon 2006-08-28 12:17:41 +0530
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060812135610-34e8ad03d56d38ad
parent: Matthieu.Moy at imag.fr-20060812134823-4d94a2dd75210d48
parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sat 2006-08-12 19:26:10 +0530
message:
merge
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060812134823-4d94a2dd75210d48
parent: Matthieu.Moy at imag.fr-20060812112413-98aee99e87c2ecc3
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sat 2006-08-12 19:18:23 +0530
message:
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060812112413-98aee99e87c2ecc3
parent: Matthieu.Moy at imag.fr-20060806181316-6e6d46134491e7de
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sat 2006-08-12 16:54:13 +0530
message:
Explain the error messages in the code.
Keep the errors for merge and log called with two revno:N:path with
different paths, but add a comment to explain why.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060806181316-6e6d46134491e7de
parent: Matthieu.Moy at imag.fr-20060806173140-b14cd3af89b64d6a
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-08-06 23:43:16 +0530
message:
bzr cat now works nicely with revno:N:path too
(even outside a branch or working tree).
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060806173140-b14cd3af89b64d6a
parent: Matthieu.Moy at imag.fr-20060806150948-6bb9550a89d54324
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-08-06 23:01:40 +0530
message:
Make log work nicely with revno:N:path too.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060806150948-6bb9550a89d54324
parent: pqm at pqm.ubuntu.com-20060802020654-9d81db40bba14f69
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.merge-revno-n-path
timestamp: Sun 2006-08-06 20:39:48 +0530
message:
Fixed merge to work nicely with -r revno:N:path
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060911152532-3762ad5c8c6c98dd
parent: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
parent: john at arbash-meinel.com-20060909005219-eee5bd7a64aa0256
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-11 16:25:32 +0100
message:
(jam) save a round trip during locking using put_bytes_non_atomic
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909005219-eee5bd7a64aa0256
parent: john at arbash-meinel.com-20060909001007-bd2a0fed41df131c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-08 19:52:19 -0500
message:
Use Stanza.to_string() rather than a RioWriter
------------------------------------------------------------
merged: john at arbash-meinel.com-20060909001007-bd2a0fed41df131c
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-08 19:10:07 -0500
message:
Use put_file_non_atomic in lockdir() to save some sftp round trips
More information about the bazaar-commits
mailing list