Rev 2212: merge bzr.dev in http://sourcefrog.net/bzr/hpss-faster-copy
Martin Pool
mbp at sourcefrog.net
Mon Apr 23 06:03:48 BST 2007
At http://sourcefrog.net/bzr/hpss-faster-copy
------------------------------------------------------------
revno: 2212
revision-id: mbp at sourcefrog.net-20070423050344-7r4w0fvmjbevcn0r
parent: mbp at sourcefrog.net-20070416153631-425bo8mmp7kkitox
parent: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: hpss-faster-copy
timestamp: Mon 2007-04-23 15:03:44 +1000
message:
merge bzr.dev
removed:
build-api build-api-20050309064830-a0be0dc1452cda87
added:
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
man1/ man1-20070418045910-74ew7wm1oqo2tfv0-1
tools/bzr_epydoc bzr_epydoc-20070409231252-ec7uffstn62q7nhv-1
tools/bzr_epydoc_uid.py bzr_epydoc_uid.py-20070409231252-ec7uffstn62q7nhv-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
HACKING HACKING-20050805200004-2a5dc975d870f78c
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/lazy_import.py lazy_import.py-20060910203832-f77c54gf3n232za0-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/branch_implementations/test_tags.py test_tags.py-20070212110545-w2s799hm2jlbsmg5-1
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/test_wsgi.py test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/tree_implementations/test_walkdirs.py test_walkdirs.py-20060729160421-gmjnkotqgxdh98ce-1
bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.26
merged: pqm at pqm.ubuntu.com-20070421151139-5wau2ukbpx5z1hv2
parent: pqm at pqm.ubuntu.com-20070421144713-wrfv38pfywoeg408
parent: john at arbash-meinel.com-20070421144319-c0lnova7qdlvvr70
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-04-21 16:11:39 +0100
message:
(John Arbash Meinel) Fix bug #105479: properly handle moving a directory with children that have been added, renamed, removed
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.16
merged: john at arbash-meinel.com-20070421144319-c0lnova7qdlvvr70
parent: john at arbash-meinel.com-20070421143950-glyo2gbmjwopp2w7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Sat 2007-04-21 09:43:19 -0500
message:
NEWS for fixing bug #105479
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.15
merged: john at arbash-meinel.com-20070421143950-glyo2gbmjwopp2w7
parent: john at arbash-meinel.com-20070420203953-qljfem7wrpujktl9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Sat 2007-04-21 09:39:50 -0500
message:
Remove a superfluous 'else' (recommended by Martin)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.14
merged: john at arbash-meinel.com-20070420203953-qljfem7wrpujktl9
parent: john at arbash-meinel.com-20070420203630-tmc7pwdid0mhkg77
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 15:39:53 -0500
message:
Clean up assert helper for missing parent.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.13
merged: john at arbash-meinel.com-20070420203630-tmc7pwdid0mhkg77
parent: john at arbash-meinel.com-20070420202856-mnb25dnlfwgkkqmh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 15:36:30 -0500
message:
Add a test for moving a directory where a child has been moved into a subdir.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.12
merged: john at arbash-meinel.com-20070420202856-mnb25dnlfwgkkqmh
parent: john at arbash-meinel.com-20070420202552-mz87cu22t6kqnyg2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 15:28:56 -0500
message:
Add a test with children that have been swapped
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.11
merged: john at arbash-meinel.com-20070420202552-mz87cu22t6kqnyg2
parent: john at arbash-meinel.com-20070420195824-ec0j48hfl8w5rii4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 15:25:52 -0500
message:
Add a test for moving a directory with a renamed child.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.10
merged: john at arbash-meinel.com-20070420195824-ec0j48hfl8w5rii4
parent: john at arbash-meinel.com-20070420195649-hx0feab8y15wdxdj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 14:58:24 -0500
message:
Make WT4.move() properly handle moving a directory with a renamed child.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.9
merged: john at arbash-meinel.com-20070420195649-hx0feab8y15wdxdj
parent: john at arbash-meinel.com-20070420194857-g37q43yd3rsqqk85
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 14:56:49 -0500
message:
Add another (failing) test when we move an entry which has a renamed child.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.8
merged: john at arbash-meinel.com-20070420194857-g37q43yd3rsqqk85
parent: john at arbash-meinel.com-20070420194239-ee3ze9cwyoealgl6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 14:48:57 -0500
message:
Fix the case when renaming a directory with deleted children.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.7
merged: john at arbash-meinel.com-20070420194239-ee3ze9cwyoealgl6
parent: john at arbash-meinel.com-20070420193709-m0f5ga3ixhlugbnn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 14:42:39 -0500
message:
While in this area, add a test for renaming a directory with removed children.
Which actually currently fails.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.6
merged: john at arbash-meinel.com-20070420193709-m0f5ga3ixhlugbnn
parent: john at arbash-meinel.com-20070420193042-d2v07ewsqzemihcp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 14:37:09 -0500
message:
Simplify the test since all we require is renaming a newly added entry's parent dir.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.5
merged: john at arbash-meinel.com-20070420193042-d2v07ewsqzemihcp
parent: john at arbash-meinel.com-20070420182016-yalhqlbsw2fmfl3w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 14:30:42 -0500
message:
Fix the bug by not iterating over the same list we are modifying.
If a record only exists in one tree (current) move_one() will remove it from
the current block. Which means that the block we are
iterating over may change underneath us. So grab a copy before iterating.
Do some other small doc updates.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.4
merged: john at arbash-meinel.com-20070420182016-yalhqlbsw2fmfl3w
parent: john at arbash-meinel.com-20070420181339-dzr68u9iywq2elxs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 13:20:16 -0500
message:
Extend the test slightly.
Oddly enough, both newly added records are moved correctly,
but the existing directory 'c/b/d' is not moved.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.3
merged: john at arbash-meinel.com-20070420181339-dzr68u9iywq2elxs
parent: john at arbash-meinel.com-20070420175713-64x3r196vbqad3y2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 13:13:39 -0500
message:
Add 2 new WT.move() tests, one of which exposes bug #105479
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.2
merged: john at arbash-meinel.com-20070420175713-64x3r196vbqad3y2
parent: john at arbash-meinel.com-20070420164821-ml7cw68e09gcr54d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 12:57:13 -0500
message:
Add a check that all entries have a valid parent entry.
If we have a non-absent entry, it must have a valid directory entry as a parent.
(You can't have a present entry in an absent directory, or in a missing dir)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24.1.1
merged: john at arbash-meinel.com-20070420164821-ml7cw68e09gcr54d
parent: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: rename_directory_105479
timestamp: Fri 2007-04-20 11:48:21 -0500
message:
Create an assertion to help track down what the bug is.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.25
merged: pqm at pqm.ubuntu.com-20070421144713-wrfv38pfywoeg408
parent: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
parent: bialix at ukr.net-20070421141508-8b2nqv6i2a0feuex
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-04-21 15:47:13 +0100
message:
(erik, bialix, r=john) Tags in long log
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.7.1.13
merged: bialix at ukr.net-20070421141508-8b2nqv6i2a0feuex
parent: bialix at ukr.net-20070419200150-yyltrlev3s65w9h9
parent: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: erik.tags
timestamp: Sat 2007-04-21 17:15:08 +0300
message:
merge bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.7.1.12
merged: bialix at ukr.net-20070419200150-yyltrlev3s65w9h9
parent: bialix at ukr.net-20070419192839-p964uu06n6vbjgrt
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: erik.tags
timestamp: Thu 2007-04-19 23:01:50 +0300
message:
direct test for tags.get_reverse_tag_dict()
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.7.1.11
merged: bialix at ukr.net-20070419192839-p964uu06n6vbjgrt
parent: bialix at ukr.net-20070412111226-acm9l3u82mxajriw
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: erik.tags
timestamp: Thu 2007-04-19 22:28:39 +0300
message:
changes after John's review
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.7.1.10
merged: bialix at ukr.net-20070412111226-acm9l3u82mxajriw
parent: erik at bagfors.nu-20070411011800-7gxbox8gbqrdp40i
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: erik.tags
timestamp: Thu 2007-04-12 14:12:26 +0300
message:
Slightly reworked: use None instead of [] as default tags list; PEP-8
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.7.1.9
merged: erik at bagfors.nu-20070411011800-7gxbox8gbqrdp40i
parent: erik at bagfors.nu-20070411010457-vgajajul01xb9hl6
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Wed 2007-04-11 03:18:00 +0200
message:
test for merges with tags in log
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.7.1.8
merged: erik at bagfors.nu-20070411010457-vgajajul01xb9hl6
parent: erik at bagfors.nu-20070411001329-ngzhv000ur5tffmn
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Wed 2007-04-11 03:04:57 +0200
message:
Redo based on input from Alexander
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.7.1.7
merged: erik at bagfors.nu-20070411001329-ngzhv000ur5tffmn
parent: erik at bagfors.nu-20070409231340-2pak5i4mxsby70ir
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Wed 2007-04-11 02:13:29 +0200
message:
use , to separate tags in log
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.7.1.6
merged: erik at bagfors.nu-20070409231340-2pak5i4mxsby70ir
parent: erik at bagfors.nu-20070405095117-ndglm72iuaxpi6u8
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Tue 2007-04-10 01:13:40 +0200
message:
change order of log headers
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.7.1.5
merged: erik at bagfors.nu-20070405095117-ndglm72iuaxpi6u8
parent: erik at bagfors.nu-20070404222123-8bg6539vy9suln32
parent: pqm at pqm.ubuntu.com-20070405073143-8fa894c829ab5e50
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Thu 2007-04-05 11:51:17 +0200
message:
[merge] bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.7.1.4
merged: erik at bagfors.nu-20070404222123-8bg6539vy9suln32
parent: erik at bagfors.nu-20070404222059-bo7nbo782gkvqfhb
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Thu 2007-04-05 00:21:23 +0200
message:
added NEWS entry
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.7.1.3
merged: erik at bagfors.nu-20070404222059-bo7nbo782gkvqfhb
parent: erik at bagfors.nu-20070404192802-pmu7ppsj4v8idg2f
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Thu 2007-04-05 00:20:59 +0200
message:
tests for tags in log output
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.7.1.2
merged: erik at bagfors.nu-20070404192802-pmu7ppsj4v8idg2f
parent: erik at bagfors.nu-20070404192718-iqk7l4s93rnqnfad
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Wed 2007-04-04 21:28:02 +0200
message:
Use the reverse tag dict to show tags in log output
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.7.1.1
merged: erik at bagfors.nu-20070404192718-iqk7l4s93rnqnfad
parent: pqm at pqm.ubuntu.com-20070330064022-bdce9356befc3795
committer: Erik Bagfors <erik at bagfors.nu>
branch nick: bzr.taglogs
timestamp: Wed 2007-04-04 21:27:18 +0200
message:
created reverse_tag_dict in tags.py
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.24
merged: pqm at pqm.ubuntu.com-20070420154033-kkrk7tn575z1o491
parent: pqm at pqm.ubuntu.com-20070420121956-hbxbonnuyt92yy4u
parent: john at arbash-meinel.com-20070420150522-lpbhxv739kynwyep
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-20 16:40:33 +0100
message:
(John Arbash Meinel) Fix bug #104257 to handle unknown files in previously empty versioned directories
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.21.2.5
merged: john at arbash-meinel.com-20070420150522-lpbhxv739kynwyep
parent: john at arbash-meinel.com-20070413144709-6f529ghpukn2fhlq
parent: pqm at pqm.ubuntu.com-20070419095256-nq0n6puj11zm7n7r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unknowns_104257
timestamp: Fri 2007-04-20 10:05:22 -0500
message:
[merge] bzr.dev 2428
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.21.2.4
merged: john at arbash-meinel.com-20070413144709-6f529ghpukn2fhlq
parent: john at arbash-meinel.com-20070411175522-5t9shbp3dbkjawsy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unknowns_104257
timestamp: Fri 2007-04-13 09:47:09 -0500
message:
Clean up the setup for clarity (suggested by Robert)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.21.2.3
merged: john at arbash-meinel.com-20070411175522-5t9shbp3dbkjawsy
parent: john at arbash-meinel.com-20070411175022-gdznyinz160vx05e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unknowns_104257
timestamp: Wed 2007-04-11 12:55:22 -0500
message:
NEWS for fixing bug #104257
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.21.2.2
merged: john at arbash-meinel.com-20070411175022-gdznyinz160vx05e
parent: john at arbash-meinel.com-20070411170244-qael9owa2l2rcneh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unknowns_104257
timestamp: Wed 2007-04-11 12:50:22 -0500
message:
Fix _iter_changes to properly handle versioned (but empty) directories
so that it yields files from there as unknown.
Also check to make sure we don't recurse into subdirectories of these dirs.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.21.2.1
merged: john at arbash-meinel.com-20070411170244-qael9owa2l2rcneh
parent: pqm at pqm.ubuntu.com-20070410074302-cf6b95587a1058cd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unknowns_104257
timestamp: Wed 2007-04-11 12:02:44 -0500
message:
Add a test which exposes the bug in WT4._iter_changes()
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.23
merged: pqm at pqm.ubuntu.com-20070420121956-hbxbonnuyt92yy4u
parent: pqm at pqm.ubuntu.com-20070420090829-aqcwsbei88o2z1zf
parent: aaron.bentley at utoronto.ca-20070420114824-jd5kfyku8qeyv844
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-20 13:19:56 +0100
message:
new formats are network-compatible with old clients (#107168)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.7
merged: aaron.bentley at utoronto.ca-20070420114824-jd5kfyku8qeyv844
parent: aaron.bentley at utoronto.ca-20070420041955-2vybpetf1bv0vktb
parent: pqm at pqm.ubuntu.com-20070420090829-aqcwsbei88o2z1zf
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-04-20 07:48:24 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.6
merged: aaron.bentley at utoronto.ca-20070420041955-2vybpetf1bv0vktb
parent: aaron.bentley at utoronto.ca-20070420032116-e1uvjjr2thrvcm8i
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-04-20 00:19:55 -0400
message:
Use ROOT_ID when the repository supports old clients (Bug #107168)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.5
merged: aaron.bentley at utoronto.ca-20070420032116-e1uvjjr2thrvcm8i
parent: abentley at panoramicfeedback.com-20070416211229-xa9pdlxs721oxhyx
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-04-19 23:21:16 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.22
merged: pqm at pqm.ubuntu.com-20070420090829-aqcwsbei88o2z1zf
parent: pqm at pqm.ubuntu.com-20070420083347-m00rr4y00xjnv7or
parent: mbp at sourcefrog.net-20070420080524-uxzqo3tgbg9d0fvi
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-20 10:08:29 +0100
message:
doc Dirstate.initialize
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.5.1
merged: mbp at sourcefrog.net-20070420080524-uxzqo3tgbg9d0fvi
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Fri 2007-04-20 18:05:24 +1000
message:
doc Dirstate.initialize
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.21
merged: pqm at pqm.ubuntu.com-20070420083347-m00rr4y00xjnv7or
parent: pqm at pqm.ubuntu.com-20070420080902-6kdj9s5jhwq4sm7v
parent: andrew.bennetts at canonical.com-20070420051146-m7pn8rgwfh1c8umz
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-20 09:33:47 +0100
message:
(Andrew Bennetts, and many others) High performance smart server: add smart (non-vfs) commands to the client and server.
------------------------------------------------------------
revno: 2190.1.51
merged: andrew.bennetts at canonical.com-20070420051146-m7pn8rgwfh1c8umz
parent: andrew.bennetts at canonical.com-20070420041837-txtmgcf5e26rlagl
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-20 15:11:46 +1000
message:
Various nits discovered by pyflakes.
------------------------------------------------------------
revno: 2190.1.50
merged: andrew.bennetts at canonical.com-20070420041837-txtmgcf5e26rlagl
parent: andrew.bennetts at canonical.com-20070420030057-cg0z7spio1stbtpo
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-20 14:18:37 +1000
message:
Remove unused import.
------------------------------------------------------------
revno: 2190.1.49
merged: andrew.bennetts at canonical.com-20070420030057-cg0z7spio1stbtpo
parent: andrew.bennetts at canonical.com-20070419145520-3j94u46y5zfh0ybq
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-20 13:00:57 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2190.1.48
merged: andrew.bennetts at canonical.com-20070419145520-3j94u46y5zfh0ybq
parent: andrew.bennetts at canonical.com-20070419042920-fwr334s98mbcxh5e
parent: andrew.bennetts at canonical.com-20070411051706-i5k643i402dtvzu3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-20 00:55:20 +1000
message:
Disconnect RemoteTransports in some tests to avoid tripping up test_strace with leftover threads from previous tests.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.23.1.1
merged: andrew.bennetts at canonical.com-20070411051706-i5k643i402dtvzu3
parent: pqm at pqm.ubuntu.com-20070411022359-403a2155afb207cf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: faster-tests
timestamp: Wed 2007-04-11 15:17:06 +1000
message:
Remove temporary directories from successful tests as soon as possible, thus making the full test suite much much faster.
------------------------------------------------------------
revno: 2190.1.47
merged: andrew.bennetts at canonical.com-20070419042920-fwr334s98mbcxh5e
parent: andrew.bennetts at canonical.com-20070418112756-0sqsp5yxemwt3mrg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Thu 2007-04-19 14:29:20 +1000
message:
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
------------------------------------------------------------
revno: 2190.1.46
merged: andrew.bennetts at canonical.com-20070418112756-0sqsp5yxemwt3mrg
parent: andrew.bennetts at canonical.com-20070418112453-r2711iqib94kutx0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-18 21:27:56 +1000
message:
Add a _server_formats flag to BzrDir.open_from_transport and BzrDirFormat.find_format, make RemoteBranch.control_files into a property.
------------------------------------------------------------
revno: 2190.1.45
merged: andrew.bennetts at canonical.com-20070418112453-r2711iqib94kutx0
parent: andrew.bennetts at canonical.com-20070418053831-u9bbsbljuzymrz6z
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-18 21:24:53 +1000
message:
Add some comments to test_clone_bzrdir_repository_branch_both_under_shared.
------------------------------------------------------------
revno: 2190.1.44
merged: andrew.bennetts at canonical.com-20070418053831-u9bbsbljuzymrz6z
parent: andrew.bennetts at canonical.com-20070418051019-tek0rr8alo1z2sop
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-18 15:38:31 +1000
message:
Various changes in response to John's review.
------------------------------------------------------------
revno: 2190.1.43
merged: andrew.bennetts at canonical.com-20070418051019-tek0rr8alo1z2sop
parent: andrew.bennetts at canonical.com-20070417095011-my9qj2tvugvslhhg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Wed 2007-04-18 15:10:19 +1000
message:
Small changes in response to Aaron's review.
------------------------------------------------------------
revno: 2190.1.42
merged: andrew.bennetts at canonical.com-20070417095011-my9qj2tvugvslhhg
parent: andrew.bennetts at canonical.com-20070417091629-2do340norot15cs5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 19:50:11 +1000
message:
Remove XXX
------------------------------------------------------------
revno: 2190.1.41
merged: andrew.bennetts at canonical.com-20070417091629-2do340norot15cs5
parent: andrew.bennetts at canonical.com-20070417090153-a7apw9czzedpt4nk
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 19:16:29 +1000
message:
Deal with some more review comments.
------------------------------------------------------------
revno: 2190.1.40
merged: andrew.bennetts at canonical.com-20070417090153-a7apw9czzedpt4nk
parent: andrew.bennetts at canonical.com-20070417043051-yt3bxfhm85byfntc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 19:01:53 +1000
message:
Deal with various review comments from Robert.
------------------------------------------------------------
revno: 2190.1.39
merged: andrew.bennetts at canonical.com-20070417043051-yt3bxfhm85byfntc
parent: andrew.bennetts at canonical.com-20070417040051-xviz3okw2ofzwwjv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 14:30:51 +1000
message:
Add some missing _ensure_real calls, and a missing import.
------------------------------------------------------------
revno: 2190.1.38
merged: andrew.bennetts at canonical.com-20070417040051-xviz3okw2ofzwwjv
parent: andrew.bennetts at canonical.com-20070416175948-939nlxb0avimk8re
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 14:00:51 +1000
message:
Reinstate forcing binary mode on windows in SmartServerStreamMedium.
------------------------------------------------------------
revno: 2190.1.37
merged: andrew.bennetts at canonical.com-20070416175948-939nlxb0avimk8re
parent: andrew.bennetts at canonical.com-20070416174935-oieoe0rv424m14ix
parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 03:59:48 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2190.1.36
merged: andrew.bennetts at canonical.com-20070416174935-oieoe0rv424m14ix
parent: andrew.bennetts at canonical.com-20070416172340-1r7vaonq2ox8ncxz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 03:49:35 +1000
message:
Rename SmartClient to _SmartClient.
------------------------------------------------------------
revno: 2190.1.35
merged: andrew.bennetts at canonical.com-20070416172340-1r7vaonq2ox8ncxz
parent: andrew.bennetts at canonical.com-20070416065300-8te6vwujl287yh5p
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 03:23:40 +1000
message:
Return 'yes'/'no' rather than 'ok'/'no' from the Repository.has_revision smart command.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.20
merged: pqm at pqm.ubuntu.com-20070420080902-6kdj9s5jhwq4sm7v
parent: pqm at pqm.ubuntu.com-20070420074025-f3uyko3oai8bj5td
parent: robertc at robertcollins.net-20070420073820-iulf74ans1v2fn8e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-20 09:09:02 +0100
message:
(robertc) Typo in the help for ``register-branch`` fixed. (Robert Collins, #96770)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.19.2.4
merged: robertc at robertcollins.net-20070420073820-iulf74ans1v2fn8e
parent: robertc at robertcollins.net-20070420070654-0spvh2id8kd2hlyb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Fri 2007-04-20 17:38:20 +1000
message:
(robertc) Typo in the help for ``register-branch`` fixed. (Robert Collins, #96770)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.19
merged: pqm at pqm.ubuntu.com-20070420074025-f3uyko3oai8bj5td
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
parent: robertc at robertcollins.net-20070420070654-0spvh2id8kd2hlyb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-04-20 08:40:25 +0100
message:
(robertc) Two minor misc-fixes.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.19.2.3
merged: robertc at robertcollins.net-20070420070654-0spvh2id8kd2hlyb
parent: robertc at robertcollins.net-20070405084449-xmkv95pa4cgn0het
parent: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Fri 2007-04-20 17:06:54 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.19.2.2
merged: robertc at robertcollins.net-20070405084449-xmkv95pa4cgn0het
parent: robertc at robertcollins.net-20070405030706-9zpyygdfimm020u8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Thu 2007-04-05 18:44:49 +1000
message:
Document BzrDir.open_workingtree's new recommend_upgrade parameter.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.19.2.1
merged: robertc at robertcollins.net-20070405030706-9zpyygdfimm020u8
parent: pqm at pqm.ubuntu.com-20070404213903-fe78a7a55c37ee95
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Thu 2007-04-05 13:07:06 +1000
message:
Split out the improvement to Transport.local_abspath to raise NotLocalURL from the hpss-faster-copy branch. (Martin Pool, Ian Clatworthy)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.18
merged: pqm at pqm.ubuntu.com-20070419224637-jvlshh6kibtj43a5
parent: pqm at pqm.ubuntu.com-20070419220315-zw3uloe4se8laybs
parent: john at arbash-meinel.com-20070419200532-4v2yyd7oqq03gl2s
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 23:46:37 +0100
message:
(John Arbash Meinel) Optimizations for MergeSorter
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.4.5
merged: john at arbash-meinel.com-20070419200532-4v2yyd7oqq03gl2s
parent: john at arbash-meinel.com-20070419160300-21woae24a6cgfvpi
parent: pqm at pqm.ubuntu.com-20070419095256-nq0n6puj11zm7n7r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_sort
timestamp: Thu 2007-04-19 15:05:32 -0500
message:
Resolve NEWS conflict
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.4.4
merged: john at arbash-meinel.com-20070419160300-21woae24a6cgfvpi
parent: john at arbash-meinel.com-20070419000301-ud6ambkulyaulnfr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_sort
timestamp: Thu 2007-04-19 11:03:00 -0500
message:
NEWS about the MergeSorter improvement.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.4.3
merged: john at arbash-meinel.com-20070419000301-ud6ambkulyaulnfr
parent: john at arbash-meinel.com-20070418233737-c2qacsh1ko9pfroi
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_sort
timestamp: Wed 2007-04-18 19:03:01 -0500
message:
Inline self._pop_node and self._push_node
These are still separate functions, but rather than using self._a_stack.append
we assign a local variable a_stack_append, and call it directly.
This drops the merge_sort() time down to approx 385ms-400ms
With that large of a speed-up it seems worth the loss
in readability. (This is almost 50% of the original time)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.4.2
merged: john at arbash-meinel.com-20070418233737-c2qacsh1ko9pfroi
parent: john at arbash-meinel.com-20070418232448-9gy9sweckh5f4mda
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_sort
timestamp: Wed 2007-04-18 18:37:37 -0500
message:
Change valid self._foo variables into local variables.
Using __slots__ changed sort time from ~700ms => ~600ms.
Using local variables drops it down to 530 - 550ms.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.4.1
merged: john at arbash-meinel.com-20070418232448-9gy9sweckh5f4mda
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_sort
timestamp: Wed 2007-04-18 18:24:48 -0500
message:
Use __slots__ for MergeSorter
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.17
merged: pqm at pqm.ubuntu.com-20070419220315-zw3uloe4se8laybs
parent: pqm at pqm.ubuntu.com-20070419213243-7s1gu2czd44bht1t
parent: john at arbash-meinel.com-20070417142905-3l0icevddeor3238
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 23:03:15 +0100
message:
(John Arbash Meinel) 'make api-docs' will generate api documentation using epydoc.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.4.2
merged: john at arbash-meinel.com-20070417142905-3l0icevddeor3238
parent: john at arbash-meinel.com-20070412202742-4cr2qmchdfe9mg7n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: api-doc-builders
timestamp: Tue 2007-04-17 09:29:05 -0500
message:
Remove the build-api script (as requested by Martin)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.4.1
merged: john at arbash-meinel.com-20070412202742-4cr2qmchdfe9mg7n
parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: api-doc-builders
timestamp: Thu 2007-04-12 15:27:42 -0500
message:
Cherrypick just the epydoc builder changes.
This is just the piece of change that makes 'make api-docs' work,
without any actual documentation changes.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.16
merged: pqm at pqm.ubuntu.com-20070419213243-7s1gu2czd44bht1t
parent: pqm at pqm.ubuntu.com-20070419203013-exud3vftmox30imx
parent: john at arbash-meinel.com-20070413202923-al52jvkh1g7e2lsm
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 22:32:43 +0100
message:
(John Arbash Meinel) Remove the time dependency for a couple tests.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.4.3.1
merged: john at arbash-meinel.com-20070413202923-al52jvkh1g7e2lsm
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: xfail_no_time
timestamp: Fri 2007-04-13 15:29:23 -0500
message:
Remove timing dependencies from the selftest tests.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.15
merged: pqm at pqm.ubuntu.com-20070419203013-exud3vftmox30imx
parent: pqm at pqm.ubuntu.com-20070419095256-nq0n6puj11zm7n7r
parent: john at arbash-meinel.com-20070419182756-rdg6e8zoaxy9mg9q
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 21:30:13 +0100
message:
(John Arbash Meinel) Simple test cleanup for win32
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.3.1
merged: john at arbash-meinel.com-20070419182756-rdg6e8zoaxy9mg9q
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_locking_fixes
timestamp: Thu 2007-04-19 13:27:56 -0500
message:
Change the DirState.test_initialize test so that we don't try to read a locked file.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.14
merged: pqm at pqm.ubuntu.com-20070419095256-nq0n6puj11zm7n7r
parent: pqm at pqm.ubuntu.com-20070419082117-znciscush3qbaky1
parent: bialix at ukr.net-20070418194650-d7p4etnr0oaki6h2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 10:52:56 +0100
message:
(bialix) some fixes for win32
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.9.2.3
merged: bialix at ukr.net-20070418194650-d7p4etnr0oaki6h2
parent: bialix at ukr.net-20070418140646-jtfgh5592o6au3zn
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-04-18 22:46:50 +0300
message:
shutil no more needed in clean_selftest_output()
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.9.2.2
merged: bialix at ukr.net-20070418140646-jtfgh5592o6au3zn
parent: bialix at ukr.net-20070417122024-276go12kd3yt8o4c
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-04-18 17:06:46 +0300
message:
Explicit error messages for test FTP server (Python 2.5 @ win32 compatibility)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.9.2.1
merged: bialix at ukr.net-20070417122024-276go12kd3yt8o4c
parent: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Tue 2007-04-17 15:20:24 +0300
message:
Fix for walkdirs in missing dir with Py2.4 @ win32
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.13
merged: pqm at pqm.ubuntu.com-20070419082117-znciscush3qbaky1
parent: pqm at pqm.ubuntu.com-20070419070906-5kdxs7n52472b7hg
parent: robertc at robertcollins.net-20070419074042-v84lrlszidihjhdy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 09:21:17 +0100
message:
(robertc) Merge see-also support for command help. (Robert Collins).
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.1.3
merged: robertc at robertcollins.net-20070419074042-v84lrlszidihjhdy
parent: robertc at robertcollins.net-20070419071317-p1pem58mcxxwbg9j
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-04-19 17:40:42 +1000
message:
Python 2.4 compatability change for the new help see-also tests.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.1.2
merged: robertc at robertcollins.net-20070419071317-p1pem58mcxxwbg9j
parent: robertc at robertcollins.net-20070419022744-pfdqz42kp1wizh43
parent: robertc at robertcollins.net-20070419053224-f5lkin1fbjj2ci0s
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-04-19 17:13:17 +1000
message:
(robertc) Merge see-also support for command help. (Robert Collins).
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.2.4
merged: robertc at robertcollins.net-20070419053224-f5lkin1fbjj2ci0s
parent: robertc at robertcollins.net-20070419052137-vsncwlmi8epl5eel
committer: Robert Collins <robertc at robertcollins.net>
branch nick: see-also
timestamp: Thu 2007-04-19 15:32:24 +1000
message:
Update the doc_generate logic to include see-also help topics.
(Robert Collins)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.2.3
merged: robertc at robertcollins.net-20070419052137-vsncwlmi8epl5eel
parent: robertc at robertcollins.net-20070419045408-uvczw1fcfzprz7ep
committer: Robert Collins <robertc at robertcollins.net>
branch nick: see-also
timestamp: Thu 2007-04-19 15:21:37 +1000
message:
Update existing builtin commands help text to use _see_also. (Robert Collins)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.2.2
merged: robertc at robertcollins.net-20070419045408-uvczw1fcfzprz7ep
parent: robertc at robertcollins.net-20070418083902-4o66h9fk7zeisvwa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: see-also
timestamp: Thu 2007-04-19 14:54:08 +1000
message:
``bzr help`` now provides cross references to other help topics using the
_see_also facility on command classes. (Robert Collins)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.2.1
merged: robertc at robertcollins.net-20070418083902-4o66h9fk7zeisvwa
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: Robert Collins <robertc at robertcollins.net>
branch nick: see-also
timestamp: Wed 2007-04-18 18:39:02 +1000
message:
Command objects can now declare related help topics by having _see_also
set to a list of related topic. Updated the HACKING guide entry on
documentation to be more clear about how the help for commands is
generated and to reference this new feature. (Robert Collins)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.12
merged: pqm at pqm.ubuntu.com-20070419070906-5kdxs7n52472b7hg
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
parent: robertc at robertcollins.net-20070419022744-pfdqz42kp1wizh43
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-04-19 08:09:06 +0100
message:
(robertc) ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388. (Robert Collins).
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11.1.1
merged: robertc at robertcollins.net-20070419022744-pfdqz42kp1wizh43
parent: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
committer: Robert Collins <robertc at robertcollins.net>
branch nick: make-man1
timestamp: Thu 2007-04-19 12:27:44 +1000
message:
``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
(Robert Collins)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.11
merged: pqm at pqm.ubuntu.com-20070417080415-5vn25svmf95ki88z
parent: pqm at pqm.ubuntu.com-20070417070943-gzsrutg0oh9timob
parent: mbp at sourcefrog.net-20070417073847-0daboq350rqofp73
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-17 09:04:15 +0100
message:
Also clear SmartTCPServer hooks from TestCase._clear_hooks
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.9.1.2
merged: mbp at sourcefrog.net-20070417073847-0daboq350rqofp73
parent: mbp at sourcefrog.net-20070417065102-zabhms9y28q2ik00
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: benchmarks
timestamp: Tue 2007-04-17 17:38:47 +1000
message:
Also clear SmartTCPServer hooks from TestCase._clear_hooks
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.9.1.1
merged: mbp at sourcefrog.net-20070417065102-zabhms9y28q2ik00
parent: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: benchmarks
timestamp: Tue 2007-04-17 16:51:02 +1000
message:
fix import order dependency that broke benchmarks
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.10
merged: pqm at pqm.ubuntu.com-20070417070943-gzsrutg0oh9timob
parent: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
parent: mbp at sourcefrog.net-20070417062623-qoqarrtsfnmokq70
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-17 08:09:43 +0100
message:
Add -1 option to selftest
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.4.2.2
merged: mbp at sourcefrog.net-20070417062623-qoqarrtsfnmokq70
parent: mbp at sourcefrog.net-20070416043858-ed8ak4hh5a4tumh8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Tue 2007-04-17 16:26:23 +1000
message:
Add -1 option to selftest
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.4.2.1
merged: mbp at sourcefrog.net-20070416043858-ed8ak4hh5a4tumh8
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Mon 2007-04-16 14:38:58 +1000
message:
Add -f alias for selftest --first
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.9
merged: pqm at pqm.ubuntu.com-20070417005930-rofskshyjsfzrahh
parent: pqm at pqm.ubuntu.com-20070416210546-4ib7pt7wkkk71zzj
parent: abentley at panoramicfeedback.com-20070416211229-xa9pdlxs721oxhyx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-17 01:59:30 +0100
message:
Fix ftp transport with servers that don't support atomic rename
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.4
merged: abentley at panoramicfeedback.com-20070416211229-xa9pdlxs721oxhyx
parent: abentley at panoramicfeedback.com-20070416210345-8btya3q24r5488md
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-04-16 17:12:29 -0400
message:
Revert now-unnecessary changes
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.3
merged: abentley at panoramicfeedback.com-20070416210345-8btya3q24r5488md
parent: abentley at panoramicfeedback.com-20070416153810-llz9qggakjio05ku
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-04-16 17:03:45 -0400
message:
Separate FtpTransport.rename from FtpTransport.move
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.2
merged: abentley at panoramicfeedback.com-20070416153810-llz9qggakjio05ku
parent: abentley at panoramicfeedback.com-20070416125430-a4qpwmrsz7h2hw39
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-04-16 11:38:10 -0400
message:
FTP does not require atomic rename. Fixes #89436
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.1
merged: abentley at panoramicfeedback.com-20070416125430-a4qpwmrsz7h2hw39
parent: abentley at panoramicfeedback.com-20070410210517-0m7mhl5d2fhs66u5
parent: pqm at pqm.ubuntu.com-20070413050623-10v4wozs1tu04kcu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-04-16 08:54:30 -0400
message:
merge bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.8
merged: pqm at pqm.ubuntu.com-20070416210546-4ib7pt7wkkk71zzj
parent: pqm at pqm.ubuntu.com-20070416180853-ucztrxo25i0fci62
parent: bialix at ukr.net-20070416204259-tyi3ptqe80gpkwcl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-16 22:05:46 +0100
message:
(bialix,r=john) win32-related selftest improvements
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.27.1.8
merged: bialix at ukr.net-20070416204259-tyi3ptqe80gpkwcl
parent: bialix at ukr.net-20070414182636-cu2loiemveb20ljh
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Mon 2007-04-16 23:42:59 +0300
message:
forget to return tree
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.27.1.7
merged: bialix at ukr.net-20070414182636-cu2loiemveb20ljh
parent: bialix at ukr.net-20070414121935-s673tupvwywawpwv
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sat 2007-04-14 21:26:36 +0300
message:
Fix blackbox test_status_out_of_date: unlock WT before next command running
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.27.1.6
merged: bialix at ukr.net-20070414121935-s673tupvwywawpwv
parent: bialix at ukr.net-20070414121842-otxkoravow2qrmyx
parent: pqm at pqm.ubuntu.com-20070413174100-zpfqleaf5ph9ycx4
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sat 2007-04-14 15:19:35 +0300
message:
merge bzr.dev
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.27.1.5
merged: bialix at ukr.net-20070414121842-otxkoravow2qrmyx
parent: bialix at ukr.net-20070414121731-jtc76rfulndihkh3
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sat 2007-04-14 15:18:42 +0300
message:
John's patch for WT4 on Windows+Python2.4
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.27.1.4
merged: bialix at ukr.net-20070414121731-jtc76rfulndihkh3
parent: bialix at ukr.net-20070414115551-zb314hff40n9fe0a
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sat 2007-04-14 15:17:31 +0300
message:
workingtree_implementations: make usage of symlinks optional
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.27.1.3
merged: bialix at ukr.net-20070414115551-zb314hff40n9fe0a
parent: bialix at ukr.net-20070413070332-dtazdq7opt2v16sc
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sat 2007-04-14 14:55:51 +0300
message:
tree_implementations: make usage of symlinks optional
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.27.1.2
merged: bialix at ukr.net-20070413070332-dtazdq7opt2v16sc
parent: bialix at ukr.net-20070413070210-mlt8fx1awnlytx3n
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Fri 2007-04-13 10:03:32 +0300
message:
intertree_implementations: make usage of symlinks optional
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.27.1.1
merged: bialix at ukr.net-20070413070210-mlt8fx1awnlytx3n
parent: pqm at pqm.ubuntu.com-20070412032019-axeg1wmcju0odfdr
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Fri 2007-04-13 10:02:10 +0300
message:
fix error handler in _rmtree_temp_dir()
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.1.7
merged: pqm at pqm.ubuntu.com-20070416180853-ucztrxo25i0fci62
parent: pqm at pqm.ubuntu.com-20070416080254-bf3rfk77k5bgfdl7
parent: andrew.bennetts at canonical.com-20070416163837-9oujyp3f2mzuvlqr
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-16 19:08:53 +0100
message:
(Andrew Bennetts) Rename SmartClient to _SmartClient.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.32.1.1.2.4
merged: andrew.bennetts at canonical.com-20070416163837-9oujyp3f2mzuvlqr
parent: andrew.bennetts at canonical.com-20070416052458-t2shorpdp62yodh3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-miscellany-2
timestamp: Tue 2007-04-17 02:38:37 +1000
message:
Rename SmartClient to _SmartClient.
Diff too large for email (4120 lines, the limit is 1000).
More information about the bazaar-commits
mailing list