Rev 1989: Merge bzr.dev. in file:///home/robertc/source/baz/test-performance/
Robert Collins
robertc at robertcollins.net
Fri Sep 8 00:31:30 BST 2006
------------------------------------------------------------
revno: 1989
revision-id: 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.
added:
bzrlib/tests/workingtree_implementations/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/bench_bench.py bench_bench.py-20060609084943-2lv2wsi61vhkmj7b-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/gpg.py gpg.py-20051017065112-8654536d415dacc6
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/text.py text.py-20050928201105-c26468dcb5d9b18b
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
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/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/fakevfat.py fakevfat.py-20060407072414-d59939fa1d6c79d9
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.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/readonly.py readonly.py-20060120032407-66d3166c39ffdc79
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060907230608-4f18ec1bbe03eb8f
parent: pqm at pqm.ubuntu.com-20060907222938-ca415c1efe88a35c
parent: robertc at robertcollins.net-20060907225055-1651b407b395fd48
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-08 00:06:08 +0100
message:
(robertc) Improve performance of bzr commit by eliminating the need for one inventory parse.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907225055-1651b407b395fd48
parent: pqm at pqm.ubuntu.com-20060907222938-ca415c1efe88a35c
parent: robertc at robertcollins.net-20060907222825-b2a11f240a09a474
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-09-08 08:50:55 +1000
message:
Merge comit performance improvement.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907222825-b2a11f240a09a474
parent: robertc at robertcollins.net-20060907084618-fae5efc1ca3c108d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add wt.unversion
timestamp: Fri 2006-09-08 08:28:25 +1000
message:
Review feedback.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907084618-fae5efc1ca3c108d
parent: robertc at robertcollins.net-20060907081744-e0a9ba051e0194bd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add wt.unversion
timestamp: Thu 2006-09-07 18:46:18 +1000
message:
When an entire subtree has been deleted, commit will now report that
just the top of the subtree has been deleted, rather than reporting
all the individual items. (Robert Collins)
Commit performs one less XML parse. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907081744-e0a9ba051e0194bd
parent: robertc at robertcollins.net-20060907081322-976bb2fb48de4f0f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add wt.unversion
timestamp: Thu 2006-09-07 18:17:44 +1000
message:
Bugfix the unversion implementation - it had a faulty inventory.remove included in it, which the initial test was not rigourous enough to detect.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907081322-976bb2fb48de4f0f
parent: robertc at robertcollins.net-20060907074457-ac9dbaab35e6ddab
parent: robertc at robertcollins.net-20060907080558-d3e2a01c00d3d4dd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add wt.unversion
timestamp: Thu 2006-09-07 18:13:22 +1000
message:
Merge in commit test case for deletion-heuristic.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907080558-d3e2a01c00d3d4dd
parent: pqm at pqm.ubuntu.com-20060906162116-90b02cf97bcc11e8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-commit-of-deleted-subtrees
timestamp: Thu 2006-09-07 18:05:58 +1000
message:
Add test case to ensure that the working tree inventory and disk state is correctly update when commit is removing directory entries.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907074457-ac9dbaab35e6ddab
parent: robertc at robertcollins.net-20060907073151-24ad889e938b4b05
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add wt.unversion
timestamp: Thu 2006-09-07 17:44:57 +1000
message:
Add test script I forgotten - doh.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060907073151-24ad889e938b4b05
parent: pqm at pqm.ubuntu.com-20060906162116-90b02cf97bcc11e8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add wt.unversion
timestamp: Thu 2006-09-07 17:31:51 +1000
message:
WorkingTree has a new api ``unversion`` which allow the unversioning of
entries by their file id. (Robert Collins)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060907222938-ca415c1efe88a35c
parent: pqm at pqm.ubuntu.com-20060907204720-3a4f5b7276ad0948
parent: john at arbash-meinel.com-20060907214121-09d5878b96e58f58
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-07 23:29:38 +0100
message:
(jam) separate out test working from test home
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907214121-09d5878b96e58f58
parent: john at arbash-meinel.com-20060907214033-40618bdf709145ef
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_home_and_work
timestamp: Thu 2006-09-07 16:41:21 -0500
message:
fix the home_is_not_working test
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907214033-40618bdf709145ef
parent: john at arbash-meinel.com-20060907213743-89623fc3adbb9b86
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_home_and_work
timestamp: Thu 2006-09-07 16:40:33 -0500
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907213743-89623fc3adbb9b86
parent: john at arbash-meinel.com-20060907213158-71df9bbd07474d1d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_home_and_work
timestamp: Thu 2006-09-07 16:37:43 -0500
message:
Remove the unneeded _set_user_ignores(['./.bazaar']) now that home has moved
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907213158-71df9bbd07474d1d
parent: pqm at pqm.ubuntu.com-20060906122016-54ab3159023ef544
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: test_home_and_work
timestamp: Thu 2006-09-07 16:31:58 -0500
message:
Update the test suite to put HOME in a different directory
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060907204720-3a4f5b7276ad0948
parent: pqm at pqm.ubuntu.com-20060906225529-7b367edabbb1ffc2
parent: john at arbash-meinel.com-20060907203743-52d89f3d2b38225b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-07 21:47:20 +0100
message:
(jam) Update how we cleanup the environment, and run_bzr_subprocess can take universal_newlines=True
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907203743-52d89f3d2b38225b
parent: john at arbash-meinel.com-20060907202907-17d6b3f3bd42b5b1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Thu 2006-09-07 15:37:43 -0500
message:
Updated NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907202907-17d6b3f3bd42b5b1
parent: john at arbash-meinel.com-20060907202017-025a3518df901ea5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Thu 2006-09-07 15:29:07 -0500
message:
Add a universal_newlines flag to run_bzr_subprocess, so we can be line-ending independent for tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060907202017-025a3518df901ea5
parent: john at arbash-meinel.com-20060906153336-0da656a7714f07a9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Thu 2006-09-07 15:20:17 -0500
message:
import sys in gpg.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906153336-0da656a7714f07a9
parent: john at arbash-meinel.com-20060906153211-9519b9dfdf3daf60
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Wed 2006-09-06 10:33:36 -0500
message:
Update NEWS that we shouldn't use preexec_fn on win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906153211-9519b9dfdf3daf60
parent: john at arbash-meinel.com-20060905141157-09649d57bb9cf247
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Wed 2006-09-06 10:32:11 -0500
message:
Don't use preexec_fn on win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905141157-09649d57bb9cf247
parent: john at arbash-meinel.com-20060905140658-85f905ffc247730f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Tue 2006-09-05 09:11:57 -0500
message:
Switch to directly setting the env, and cleaning it up. So that it works on all platforms
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905140658-85f905ffc247730f
parent: john at arbash-meinel.com-20060905135730-d51221405aa03eb2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Tue 2006-09-05 09:06:58 -0500
message:
Use the new helper function in a few places
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905135730-d51221405aa03eb2
parent: john at arbash-meinel.com-20060902150748-720dd94b32896aac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run-subprocess
timestamp: Tue 2006-09-05 08:57:30 -0500
message:
Create an osutils helper function for modifying the environment
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060906225529-7b367edabbb1ffc2
parent: pqm at pqm.ubuntu.com-20060906162116-90b02cf97bcc11e8
parent: john at arbash-meinel.com-20060906215658-422a15bab820945c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-06 23:55:29 +0100
message:
(jam) delay creating knit contents for significantly better new commit and push performance
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906215658-422a15bab820945c
parent: john at arbash-meinel.com-20060906215139-48d4e17bcf86a97c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 16:56:58 -0500
message:
Small cleanup
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906215139-48d4e17bcf86a97c
parent: john at arbash-meinel.com-20060906214940-d46dc5bd454672ad
parent: john at arbash-meinel.com-20060906214549-1ac6815d44926e1a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 16:51:39 -0500
message:
Fix the sftp mkdir mode code
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906214549-1ac6815d44926e1a
parent: pqm at pqm.ubuntu.com-20060906162116-90b02cf97bcc11e8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp_mode_bits
timestamp: Wed 2006-09-06 16:45:49 -0500
message:
Restore mode bit tests for sftp, and track down bugs
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906214940-d46dc5bd454672ad
parent: john at arbash-meinel.com-20060906205407-7daa22adaea61492
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 16:49:40 -0500
message:
Pass in the directory mode to the knit
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906205407-7daa22adaea61492
parent: john at arbash-meinel.com-20060906204245-2c4b8481f344d692
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 15:54:07 -0500
message:
Test that passing modes does the right thing for knits.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906204245-2c4b8481f344d692
parent: john at arbash-meinel.com-20060906152328-aa73b664a5f17eb3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 15:42:45 -0500
message:
Add ability to pass a directory mode to non_atomic_put
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906152328-aa73b664a5f17eb3
parent: john at arbash-meinel.com-20060906152150-25d59d381a869186
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 10:23:28 -0500
message:
Update NEWS, since commit is faster too
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906152150-25d59d381a869186
parent: john at arbash-meinel.com-20060905231850-c870288bfb3fcab8
parent: john at arbash-meinel.com-20060906151639-93b8bc367dd73182
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Wed 2006-09-06 10:21:50 -0500
message:
[merge] up-to-date with Transport.put_*_non_atomic
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905231850-c870288bfb3fcab8
parent: john at arbash-meinel.com-20060905230922-6ed11ce0a4b04065
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Tue 2006-09-05 18:18:50 -0500
message:
NEWS about fixing bug #44692
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905230922-6ed11ce0a4b04065
parent: john at arbash-meinel.com-20060818231423-6daa262d1263c896
parent: john at arbash-meinel.com-20060905223705-a0454e4187d4eb87
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Tue 2006-09-05 18:09:22 -0500
message:
[merge] transport_bytes: bring knit churn up-to-date with new *{bytes,file} functions
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818231423-6daa262d1263c896
parent: john at arbash-meinel.com-20060818225219-6f4bfa3870d716b7
parent: pqm at pqm.ubuntu.com-20060818230844-138315adab4cfe22
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 18:14:23 -0500
message:
[merge] bzr.dev 1948
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818225219-6f4bfa3870d716b7
parent: john at arbash-meinel.com-20060818225138-6c93f68102a6c579
parent: john at arbash-meinel.com-20060818164853-eb25e4db3385e216
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 17:52:19 -0500
message:
[merge] sftp benchmarks
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818225138-6c93f68102a6c579
parent: john at arbash-meinel.com-20060818224609-e4cbe8bdb33bdd34
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 17:51:38 -0500
message:
Make knit stores delay creation, but not control stores
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818224609-e4cbe8bdb33bdd34
parent: john at arbash-meinel.com-20060818222925-fea833eabf8277b1
parent: john at arbash-meinel.com-20060818224509-adc944a62d4b826a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 17:46:09 -0500
message:
[merge] transport-non-atomic-put
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818222925-fea833eabf8277b1
parent: john at arbash-meinel.com-20060818222437-03dd852ab6d65995
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 17:29:25 -0500
message:
Pass around the file mode correctly
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818222437-03dd852ab6d65995
parent: john at arbash-meinel.com-20060818221703-958786fafe340fd9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 17:24:37 -0500
message:
test delay_create does the right thing
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818221703-958786fafe340fd9
parent: john at arbash-meinel.com-20060818202149-7ec79b6227875c69
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reduce-knit-churn
timestamp: Fri 2006-08-18 17:17:03 -0500
message:
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060906162116-90b02cf97bcc11e8
parent: pqm at pqm.ubuntu.com-20060906122016-54ab3159023ef544
parent: john at arbash-meinel.com-20060906151639-93b8bc367dd73182
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-06 17:21:16 +0100
message:
(jam) create Transport.*_{file,bytes}
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906151639-93b8bc367dd73182
parent: john at arbash-meinel.com-20060906143718-20e9c5d9a6fe92f9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Wed 2006-09-06 10:16:39 -0500
message:
fix small bug
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906143718-20e9c5d9a6fe92f9
parent: john at arbash-meinel.com-20060906130107-bed5cf2974af9cc9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Wed 2006-09-06 09:37:18 -0500
message:
Use applyDeprecated instead of callDeprecated
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906130107-bed5cf2974af9cc9
parent: john at arbash-meinel.com-20060906025751-686364ac616b8e91
parent: pqm at pqm.ubuntu.com-20060906122016-54ab3159023ef544
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Wed 2006-09-06 08:01:07 -0500
message:
[merge] bzr.dev 1987
------------------------------------------------------------
merged: john at arbash-meinel.com-20060906025751-686364ac616b8e91
parent: john at arbash-meinel.com-20060905223705-a0454e4187d4eb87
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 21:57:51 -0500
message:
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905223705-a0454e4187d4eb87
parent: john at arbash-meinel.com-20060905223310-ba7960b29a3bf380
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 17:37:05 -0500
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905223310-ba7960b29a3bf380
parent: john at arbash-meinel.com-20060905223057-0a080c529bb00814
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 17:33:10 -0500
message:
apply a FIXME
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905223057-0a080c529bb00814
parent: john at arbash-meinel.com-20060905222648-8ad450b9c6110c5e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 17:30:57 -0500
message:
Update Knit to use the new non_atomic_foo functions
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905222648-8ad450b9c6110c5e
parent: john at arbash-meinel.com-20060905221743-8ed5661484b17f73
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 17:26:48 -0500
message:
Start using the new deprecation_string function
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905221743-8ed5661484b17f73
parent: john at arbash-meinel.com-20060905221715-a42babddf5f61833
parent: pqm at pqm.ubuntu.com-20060905221300-d2c3e00cf7ff3eee
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 17:17:43 -0500
message:
[merge] bzr.dev 1985
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905221715-a42babddf5f61833
parent: john at arbash-meinel.com-20060905220327-ed78d9feccf3c79c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 17:17:15 -0500
message:
Update the LocalTransport and SftpTransport to implement non_atomic_*
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905220327-ed78d9feccf3c79c
parent: john at arbash-meinel.com-20060905215117-7a18e258ffdb1fbd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 17:03:27 -0500
message:
Add non_atomic_put_bytes() and tests for it
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905215117-7a18e258ffdb1fbd
parent: john at arbash-meinel.com-20060905214729-ff34d647fbe8c1dc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 16:51:17 -0500
message:
rename non_atomic_put => non_atomic_put_file
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905214729-ff34d647fbe8c1dc
parent: john at arbash-meinel.com-20060905214008-03561b3cb71f243c
parent: john at arbash-meinel.com-20060818224509-adc944a62d4b826a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 16:47:29 -0500
message:
[merge] Transport.non_atomic_put()
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818224509-adc944a62d4b826a
parent: john at arbash-meinel.com-20060818223006-02e125b3c6b71e0b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport-nonatomic-put
timestamp: Fri 2006-08-18 17:45:09 -0500
message:
make sure to always close the file object.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818223006-02e125b3c6b71e0b
parent: john at arbash-meinel.com-20060818202149-7ec79b6227875c69
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport-nonatomic-put
timestamp: Fri 2006-08-18 17:30:06 -0500
message:
chmod the correct path
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818202149-7ec79b6227875c69
parent: john at arbash-meinel.com-20060818194340-a9e3d415cdbb3602
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport-nonatomic-put
timestamp: Fri 2006-08-18 15:21:49 -0500
message:
Update non_atomic_put to have a create_parent_dir flag
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818194340-a9e3d415cdbb3602
parent: john at arbash-meinel.com-20060818194251-2ebcabc5c2f5efee
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport-nonatomic-put
timestamp: Fri 2006-08-18 14:43:40 -0500
message:
remove old comment in sftp.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818194251-2ebcabc5c2f5efee
parent: john at arbash-meinel.com-20060818193345-d1bbb8a60252e6b9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport-nonatomic-put
timestamp: Fri 2006-08-18 14:42:51 -0500
message:
Basic implementation of non_atomic_put for sftp
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818193345-d1bbb8a60252e6b9
parent: john at arbash-meinel.com-20060818193105-324c69146ac70f09
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport-nonatomic-put
timestamp: Fri 2006-08-18 14:33:45 -0500
message:
Switch build_tree to use non_atomic_put()
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818193105-324c69146ac70f09
parent: john at arbash-meinel.com-20060818193050-9da47e496bc0166f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport-nonatomic-put
timestamp: Fri 2006-08-18 14:31:05 -0500
message:
Basic implementation for local transport
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818193050-9da47e496bc0166f
parent: john at arbash-meinel.com-20060818192624-c0588c0478d239cc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport-nonatomic-put
timestamp: Fri 2006-08-18 14:30:50 -0500
message:
Add tests for permissions
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818192624-c0588c0478d239cc
parent: john at arbash-meinel.com-20060818192346-aa3a588deb7d5011
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport-nonatomic-put
timestamp: Fri 2006-08-18 14:26:24 -0500
message:
Comment about possible api change
------------------------------------------------------------
merged: john at arbash-meinel.com-20060818192346-aa3a588deb7d5011
parent: pqm at pqm.ubuntu.com-20060818114834-a407f02ea4e0337b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport-nonatomic-put
timestamp: Fri 2006-08-18 14:23:46 -0500
message:
Stub out the test and basic implementation for 'non_atomic_put'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905214008-03561b3cb71f243c
parent: john at arbash-meinel.com-20060905212515-60abd5d7c8d6fb69
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 16:40:08 -0500
message:
Fix some bugs in Transport.append(mode!=None)
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905212515-60abd5d7c8d6fb69
parent: john at arbash-meinel.com-20060905212024-39f58d0f5acd74a4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 16:25:15 -0500
message:
Switch over to Transport.append_bytes or append_files
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905212024-39f58d0f5acd74a4
parent: john at arbash-meinel.com-20060905211435-0dd23ef2b46de6d6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 16:20:24 -0500
message:
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905211435-0dd23ef2b46de6d6
parent: john at arbash-meinel.com-20060905205828-6b69f9a2e2fb8100
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 16:14:35 -0500
message:
Correctly fix the workingtree put() test fixes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905205828-6b69f9a2e2fb8100
parent: john at arbash-meinel.com-20060905204231-847b9a2e5a642efc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 15:58:28 -0500
message:
Run the full test suite, and fix up any deprecation warnings.
That includes some Store tests that used to try and pass a string for the
file-like object.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905204231-847b9a2e5a642efc
parent: john at arbash-meinel.com-20060905204200-c3ee0a8c8c2aa46b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 15:42:31 -0500
message:
Track down another deprecated call to put()
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905204200-c3ee0a8c8c2aa46b
parent: john at arbash-meinel.com-20060905202757-504f1f3519a25183
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 15:42:00 -0500
message:
Clean up the rest of the api calls to deprecated functions in the test suite, and make sure Transport._pump is only accepting files, not strings
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905202757-504f1f3519a25183
parent: john at arbash-meinel.com-20060905200852-067430c9209fea7f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 15:27:57 -0500
message:
clean up append, append_bytes, and append_multi tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905200852-067430c9209fea7f
parent: john at arbash-meinel.com-20060905195839-307783fb130a341c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 15:08:52 -0500
message:
Find more occurrances of put() and replace with put_file or put_bytes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905195839-307783fb130a341c
parent: john at arbash-meinel.com-20060905195321-167cc7f7c4b09fa0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 14:58:39 -0500
message:
avoid some deprecation warnings in other parts of the code
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905195321-167cc7f7c4b09fa0
parent: john at arbash-meinel.com-20060905193434-2ae27ba5c50bae61
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 14:53:21 -0500
message:
Fix the deprecation warnings in the transport tests themselves
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905193434-2ae27ba5c50bae61
parent: john at arbash-meinel.com-20060905184828-c1506e1933420522
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 14:34:34 -0500
message:
Lots of deprecation warnings, but no errors
------------------------------------------------------------
merged: john at arbash-meinel.com-20060905184828-c1506e1933420522
parent: john at arbash-meinel.com-20060824192406-3bcf52af61709d31
parent: pqm at pqm.ubuntu.com-20060905151701-a66a42db631e39ec
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Tue 2006-09-05 13:48:28 -0500
message:
[merge] bzr.dev 1984
------------------------------------------------------------
merged: john at arbash-meinel.com-20060824192406-3bcf52af61709d31
parent: john at arbash-meinel.com-20060824191728-2164fd6bb3cc681f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Thu 2006-08-24 14:24:06 -0500
message:
Fix 2 calls to 'put()' that were using strings instead of files
------------------------------------------------------------
merged: john at arbash-meinel.com-20060824191728-2164fd6bb3cc681f
parent: john at arbash-meinel.com-20060824191503-918042ee394f3120
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Thu 2006-08-24 14:17:28 -0500
message:
Implement and test 'get_bytes'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060824191503-918042ee394f3120
parent: john at arbash-meinel.com-20060824190709-af1edd54464abb7b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Thu 2006-08-24 14:15:03 -0500
message:
Implement and test 'Transport.append_bytes', cleanup the tests of plain append
------------------------------------------------------------
merged: john at arbash-meinel.com-20060824190709-af1edd54464abb7b
parent: pqm at pqm.ubuntu.com-20060824002222-09d7139ba6ad0e6c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: transport_bytes
timestamp: Thu 2006-08-24 14:07:09 -0500
message:
Add put_bytes() and a base-level implementation for it
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060906122016-54ab3159023ef544
parent: pqm at pqm.ubuntu.com-20060905233301-2e69db43982088ae
parent: aaron.bentley at utoronto.ca-20060906120001-b3d70c642260d590
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-06 13:20:16 +0100
message:
Improve conflict message for deleting directories with contents
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060906120001-b3d70c642260d590
parent: aaron.bentley at utoronto.ca-20060906024754-01d97ef6178594f5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-06 08:00:01 -0400
message:
Tweaked conflict message to be more understandable
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060906024754-01d97ef6178594f5
parent: aaron.bentley at utoronto.ca-20060905032826-d1e87f8b82bdb4cb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-09-05 22:47:54 -0400
message:
Improve message when OTHER deletes an in-use tree
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060905032826-d1e87f8b82bdb4cb
parent: abentley at panoramicfeedback.com-20060830132022-f1abf26606b57595
parent: pqm at pqm.ubuntu.com-20060904084408-ebdbb37a1cdb0c53
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2006-09-04 23:28:26 -0400
message:
Merge bzr.dev
More information about the bazaar-commits
mailing list