Rev 2006: Merge bzr.dev. in file:///home/robertc/source/baz/test-performance/
Robert Collins
robertc at robertcollins.net
Fri Oct 13 08:12:54 BST 2006
------------------------------------------------------------
revno: 2006
revision-id: robertc at robertcollins.net-20061013071251-b49ee527c95bcacf
parent: robertc at robertcollins.net-20061006003100-2ef87a9af77db232
parent: robertc at robertcollins.net-20061013064514-2fddd7f772445db3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: init-tree-overhead
timestamp: Fri 2006-10-13 17:12:51 +1000
message:
Merge bzr.dev.
added:
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/bench_info.py bench_info.py-20060719045551-x5ixdrwbw57cg19z-1
bzrlib/benchmarks/bench_startup.py bench_startup.py-20061006075337-q49on3zvfcbvarn3-1
bzrlib/benchmarks/tree_creator/many_commit.py many_commit.py-20060819021600-khvri55v4f6edzsl-1
bzrlib/lazy_regex.py lazy_regex.py-20061009091222-fyettq6z5qomdl9e-1
bzrlib/tests/test_lazy_regex.py test_lazy_regex.py-20061009091222-fyettq6z5qomdl9e-2
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
NEWS NEWS-20050323055033-4e00b5db738777ff
TODO TODO-20050426050852-44d2ad9048dafbe9
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_rocks.py bench_rocks.py-20060608120339-3ydxl3v2cori44zb-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/doc/api/branch.txt branch.txt-20060130010728-d96c35d50b205aed
bzrlib/gpg.py gpg.py-20051017065112-8654536d415dacc6
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lazy_import.py lazy_import.py-20060910203832-f77c54gf3n232za0-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
profile_imports.py profile_imports.py-20060618020306-k5uw80achysrokj9-1
------------------------------------------------------------
merged: robertc at robertcollins.net-20061013064514-2fddd7f772445db3
parent: robertc at robertcollins.net-20061006002822-6e4d6301d27a8e0e
parent: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: memory-tree-with-format
timestamp: Fri 2006-10-13 16:45:14 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061012011808-6bdb1458abfdc13a
parent: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
parent: john at arbash-meinel.com-20061012010742-6336ae9eeebf291d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-12 02:18:08 +0100
message:
(James Henstridge) Allow config entries to cascade
------------------------------------------------------------
merged: john at arbash-meinel.com-20061012010742-6336ae9eeebf291d
parent: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
parent: james at jamesh.id.au-20061004071239-bb32b93e159b7899
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-10-11 20:07:42 -0500
message:
(James Henstridge) Allow config entries to cascade
------------------------------------------------------------
merged: james at jamesh.id.au-20061004071239-bb32b93e159b7899
parent: james at jamesh.id.au-20061002133602-03fc66bf9677d07b
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Wed 2006-10-04 15:12:39 +0800
message:
get rid of the recurse argument to get_user_option()
------------------------------------------------------------
merged: james at jamesh.id.au-20061002133602-03fc66bf9677d07b
parent: james at jamesh.id.au-20061002111054-31fd65f92aeb30e4
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Mon 2006-10-02 21:36:02 +0800
message:
add back recurse=False option to config file
------------------------------------------------------------
merged: james at jamesh.id.au-20061002111054-31fd65f92aeb30e4
parent: james at jamesh.id.au-20060918025905-aa20656f1b0b34a0
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Mon 2006-10-02 19:10:54 +0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: james at jamesh.id.au-20060918025905-aa20656f1b0b34a0
parent: james at jamesh.id.au-20060908043002-c7f13407e7d4109c
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Mon 2006-09-18 10:59:05 +0800
message:
make _get_matching_sections() return (section, extra_path) tuples, and adjust other code to match
------------------------------------------------------------
merged: james at jamesh.id.au-20060908043002-c7f13407e7d4109c
parent: james at jamesh.id.au-20060908031106-1b304673906dcf8f
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Fri 2006-09-08 12:30:02 +0800
message:
make test break again
------------------------------------------------------------
merged: james at jamesh.id.au-20060908031106-1b304673906dcf8f
parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
committer: James Henstridge <james at jamesh.id.au>
branch nick: bzr.locationconfig
timestamp: Fri 2006-09-08 11:11:06 +0800
message:
first go at making location config lookup recursive
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
parent: pqm at pqm.ubuntu.com-20061011092657-e42bec6ef14c036c
parent: john at arbash-meinel.com-20061011085152-65de197133d8bd41
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-10-12 01:51:31 +0100
message:
(John Arbash Meinel) Fix bug #62473
------------------------------------------------------------
merged: john at arbash-meinel.com-20061011085152-65de197133d8bd41
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dont_require_content_type_62473
timestamp: Wed 2006-10-11 18:51:52 +1000
message:
Fix bug #62473 by not requiring content-type in range responses
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061011092657-e42bec6ef14c036c
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
parent: john at arbash-meinel.com-20061011011715-cead1acd0ee04372
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-10-11 10:26:57 +0100
message:
(John Arbash Meinel) use lazy importing to improve startup time
------------------------------------------------------------
merged: john at arbash-meinel.com-20061011011715-cead1acd0ee04372
parent: john at arbash-meinel.com-20061011002323-82ba88c293d7caff
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Wed 2006-10-11 11:17:15 +1000
message:
Update HACKING and TODO
------------------------------------------------------------
merged: john at arbash-meinel.com-20061011002323-82ba88c293d7caff
parent: john at arbash-meinel.com-20061006075043-c6a5c1e0bfd001bb
parent: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Wed 2006-10-11 10:23:23 +1000
message:
[merge] bzr.dev 2070
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006075043-c6a5c1e0bfd001bb
parent: john at arbash-meinel.com-20061006074457-c2ab0b4e243899bf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:50:43 +1000
message:
more lazy importing gets bzr rocks down to 116ms
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006074457-c2ab0b4e243899bf
parent: john at arbash-meinel.com-20061006073616-c9a36866b39fce47
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:44:57 +1000
message:
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006073616-c9a36866b39fce47
parent: john at arbash-meinel.com-20061006072917-b4cae3e6fe80f712
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:36:16 +1000
message:
make bzrlib/conflicts.py lazy
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006072917-b4cae3e6fe80f712
parent: john at arbash-meinel.com-20061006072555-b41c9a6f481fd1d6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:29:17 +1000
message:
from bzrlib.ui lazy import progress, and make progress import lazily
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006072555-b41c9a6f481fd1d6
parent: john at arbash-meinel.com-20061006072218-930b322b5d303872
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:25:55 +1000
message:
Make bzrlib.config use lazy importing
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006072218-930b322b5d303872
parent: john at arbash-meinel.com-20061006071431-90c2cbe88302e462
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:22:18 +1000
message:
Don't import 'bzrlib.tree' directly in bzrlib.builtins
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006071431-90c2cbe88302e462
parent: john at arbash-meinel.com-20061006071351-e3fdd47eed1c3e7e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:14:31 +1000
message:
don't import errors, and try to lazy import logging in bzrlib.trace
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006071351-e3fdd47eed1c3e7e
parent: john at arbash-meinel.com-20061006070355-c8b1a246df0c0933
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:13:51 +1000
message:
lazy import revisionspec and errors for bzrlib.options
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006070355-c8b1a246df0c0933
parent: john at arbash-meinel.com-20061006070057-d09e21288bcd371c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:03:55 +1000
message:
lazy import getpass in bzrlib.ui.text
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006070057-d09e21288bcd371c
parent: john at arbash-meinel.com-20061006070031-1206bad6a645029c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:00:57 +1000
message:
Make cmd_version_info.py lazy import most other modules
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006070031-1206bad6a645029c
parent: john at arbash-meinel.com-20061006064134-0716158c26306b4d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 17:00:31 +1000
message:
Make importing errors lazy for osutils
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006064134-0716158c26306b4d
parent: john at arbash-meinel.com-20061006063211-389ac4db0ce7167c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 16:41:34 +1000
message:
NEWS about even better rocks time
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006063211-389ac4db0ce7167c
parent: john at arbash-meinel.com-20061006062706-e84640cea080b6e9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 01:32:11 -0500
message:
also avoid importing WorkingTree before it is needed
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006062706-e84640cea080b6e9
parent: john at arbash-meinel.com-20061006062402-bd9aa74abbcdfe67
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 01:27:06 -0500
message:
shave off another 10ms by avoiding importing merge from working tree
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006062402-bd9aa74abbcdfe67
parent: john at arbash-meinel.com-20061006055344-e73b97b7c6ca6e72
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 16:24:02 +1000
message:
NEWS about improved startup times
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006055344-e73b97b7c6ca6e72
parent: john at arbash-meinel.com-20061006003846-b447b3dda0c17ce2
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 15:53:44 +1000
message:
[merge] bzr.dev 2063
------------------------------------------------------------
merged: john at arbash-meinel.com-20061006003846-b447b3dda0c17ce2
parent: john at arbash-meinel.com-20061005224209-6847d92c751c2dc1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 10:38:46 +1000
message:
make lazy_import lazily import errors
------------------------------------------------------------
merged: john at arbash-meinel.com-20061005224209-6847d92c751c2dc1
parent: john at arbash-meinel.com-20060913032103-c2ad6ab606f96839
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Fri 2006-10-06 08:42:09 +1000
message:
Now that mkdtemp and rmtree are lazy, they should not be directly improted.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913032103-c2ad6ab606f96839
parent: john at arbash-meinel.com-20060913032041-593053ae0d35b0d5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 22:21:03 -0500
message:
lazy_import plugin and transport/local
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913032041-593053ae0d35b0d5
parent: john at arbash-meinel.com-20060913025149-ecee20a9ca6fc4a6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 22:20:41 -0500
message:
Update output of --profile-imports to understand from foo import bar time
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913025149-ecee20a9ca6fc4a6
parent: john at arbash-meinel.com-20060913024423-2f0729076ddd4e31
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 21:51:49 -0500
message:
lazy_import AtomicFile
------------------------------------------------------------
merged: john at arbash-meinel.com-20060913024423-2f0729076ddd4e31
parent: john at arbash-meinel.com-20060912231716-b46abd2325a03c0d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 21:44:23 -0500
message:
lazy_import osutils and sign_my_commits
Move doc tests into test_osutils, since lazy_import doesn't play nicely
with DocTest
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912231716-b46abd2325a03c0d
parent: john at arbash-meinel.com-20060912225953-6d8567932927b1e3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 18:17:16 -0500
message:
Fix the inventory doc tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912225953-6d8567932927b1e3
parent: john at arbash-meinel.com-20060912223718-b605523794911ca9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:59:53 -0500
message:
Change how 'revision' is imported to avoid problems later
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912223718-b605523794911ca9
parent: john at arbash-meinel.com-20060912222528-309c74df59ea80b6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:37:18 -0500
message:
Hack around loading 'copy' to make startup much faster
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912222528-309c74df59ea80b6
parent: john at arbash-meinel.com-20060912221638-bf11ba3e3f498106
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:25:28 -0500
message:
lazy_import inventory.py, avoids importing tarfile
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912221638-bf11ba3e3f498106
parent: john at arbash-meinel.com-20060912221230-d3980a26890a32e3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:16:38 -0500
message:
lazy_import diff.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912221230-d3980a26890a32e3
parent: john at arbash-meinel.com-20060912220329-0683bcd6066fc117
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:12:30 -0500
message:
lazy_import bundle and bundle.commands
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912220329-0683bcd6066fc117
parent: john at arbash-meinel.com-20060912211954-3d8074cfb66e1139
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 17:03:29 -0500
message:
lazy import versionedfile, late-load bzrlib.merge
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912211954-3d8074cfb66e1139
parent: john at arbash-meinel.com-20060912204642-91599869cc863f07
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 16:19:54 -0500
message:
Find a few places that weren't importing their dependencies.
Demandload a few more places.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912204642-91599869cc863f07
parent: john at arbash-meinel.com-20060912202803-3bcdde1ff7245c8f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:46:42 -0500
message:
Cleanup, deprecated, and get the tests passing again.
bzrlib.builtins.merge is heavily used by the test suite, though it is
really the wrong place for a function like that.
lazy imports work badly with doctests, but so far none of the doc tested
modules had anything worth testing in that fashion.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912202803-3bcdde1ff7245c8f
parent: john at arbash-meinel.com-20060912201643-66a32bc419a28c6f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:28:03 -0500
message:
lazy_import bzrlib/repository.py
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912201643-66a32bc419a28c6f
parent: john at arbash-meinel.com-20060912201032-0bd76e7736ebf2f1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:16:43 -0500
message:
Shave off another 40ms by demand loading branch and bzrdir
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912201032-0bd76e7736ebf2f1
parent: john at arbash-meinel.com-20060912200229-4a1c12aead0f0b30
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:10:32 -0500
message:
Make profile_imports aware of lazy_import stuff
------------------------------------------------------------
merged: john at arbash-meinel.com-20060912200229-4a1c12aead0f0b30
parent: john at arbash-meinel.com-20060912193702-22c752299731a663
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: use_lazy_importer
timestamp: Tue 2006-09-12 15:02:29 -0500
message:
Demandloading builtins.py drops our load time from 350ms to 291ms
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
parent: pqm at pqm.ubuntu.com-20061010070912-10e1b070dacb4c40
parent: john at arbash-meinel.com-20061010062639-6d527d0f9a3401d8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 08:23:07 +0100
message:
(John Arbash Meinel) Handle exceptions while opening /dev/urandom
------------------------------------------------------------
merged: john at arbash-meinel.com-20061010062639-6d527d0f9a3401d8
parent: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: urandom-56883
timestamp: Tue 2006-10-10 01:26:39 -0500
message:
Catch an exception while opening /dev/urandom rather than using os.path.exists()
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010070912-10e1b070dacb4c40
parent: pqm at pqm.ubuntu.com-20061010062841-4ead1a4fe1a05d85
parent: john at arbash-meinel.com-20061010064845-173353db11a009a0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 08:09:12 +0100
message:
(John Arbash Meinel) bzrlib.lazy_regex.lazy_compile creates regex objects that are compiled on demand
------------------------------------------------------------
merged: john at arbash-meinel.com-20061010064845-173353db11a009a0
parent: john at arbash-meinel.com-20061009140624-0ebc61ab6809f5f4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Tue 2006-10-10 16:48:45 +1000
message:
review feedback from Martin
------------------------------------------------------------
merged: john at arbash-meinel.com-20061009140624-0ebc61ab6809f5f4
parent: john at arbash-meinel.com-20061009140153-7309bd80a9efe949
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Tue 2006-10-10 00:06:24 +1000
message:
Install lazy compile during startup
------------------------------------------------------------
merged: john at arbash-meinel.com-20061009140153-7309bd80a9efe949
parent: john at arbash-meinel.com-20061009094101-dd6f359aa5ae70a0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Tue 2006-10-10 00:01:53 +1000
message:
Update profile imports to be aware of the new compiler
------------------------------------------------------------
merged: john at arbash-meinel.com-20061009094101-dd6f359aa5ae70a0
parent: john at arbash-meinel.com-20061009091729-c3fce6ea7f2e24b3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Mon 2006-10-09 19:41:01 +1000
message:
Add install and unistall functions, and tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20061009091729-c3fce6ea7f2e24b3
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lazy_regex
timestamp: Mon 2006-10-09 19:17:29 +1000
message:
bzrlib.lazy_regex.lazy_compile creates a proxy object around re.compile()
This object compiles on first use, rather than compiling instantly.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010062841-4ead1a4fe1a05d85
parent: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
parent: mbp at sourcefrog.net-20061006020417-4949ca86f4417a4d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 07:28:41 +0100
message:
(mbp) benchmark updates
------------------------------------------------------------
merged: mbp at sourcefrog.net-20061006020417-4949ca86f4417a4d
parent: cfbolz at gmx.de-20061003153429-3e8c8eeddeb0bf2f
parent: cfbolz at gmx.de-20061004101753-20c01466441296e7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: usecases-benchmarks
timestamp: Fri 2006-10-06 12:04:17 +1000
message:
merge additional fix from cfbolz
------------------------------------------------------------
merged: cfbolz at gmx.de-20061004101753-20c01466441296e7
parent: cfbolz at gmx.de-20061003153429-3e8c8eeddeb0bf2f
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Wed 2006-10-04 12:17:53 +0200
message:
Fix make_kernel_like_tree_committed, which does not exist any more :-(.
------------------------------------------------------------
merged: cfbolz at gmx.de-20061003153429-3e8c8eeddeb0bf2f
parent: cfbolz at gmx.de-20060929202719-d082c8d3e121b9b5
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Tue 2006-10-03 17:34:29 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060929202719-d082c8d3e121b9b5
parent: cfbolz at gmx.de-20060907105447-6f3d4a77145e32c0
parent: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Fri 2006-09-29 22:27:19 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060907105447-6f3d4a77145e32c0
parent: cfbolz at gmx.de-20060907105159-095161f93d8c498a
parent: pqm at pqm.ubuntu.com-20060906225529-7b367edabbb1ffc2
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Thu 2006-09-07 12:54:47 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060907105159-095161f93d8c498a
parent: cfbolz at gmx.de-20060830194435-4cfd4fe6105322d6
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Thu 2006-09-07 12:51:59 +0200
message:
Fix bundle benchmarks: don't do install_bundle on too many revisions: takes way
too long. Split up timing of install_bundle and write_bundle.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060830194435-4cfd4fe6105322d6
parent: cfbolz at gmx.de-20060830194406-969c5f912785214b
parent: pqm at pqm.ubuntu.com-20060830143731-af84f2be15714815
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Wed 2006-08-30 21:44:35 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060830194406-969c5f912785214b
parent: cfbolz at gmx.de-20060819021716-4a2cdd443e83721b
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Wed 2006-08-30 21:44:06 +0200
message:
Fix problems pointed out by John:
* Actually benchmark install_bundle too.
* Fix PEP 8 issues.
* Fix caching of trees by using names dependant on the parameters.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060819021716-4a2cdd443e83721b
parent: cfbolz at gmx.de-20060818234018-118df10a4b1e0cba
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Sat 2006-08-19 04:17:16 +0200
message:
Refactor the bundle benchmarks to use the existing helper functions.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060818234018-118df10a4b1e0cba
parent: cfbolz at gmx.de-20060818233750-db224a07bf88740b
parent: pqm at pqm.ubuntu.com-20060818230844-138315adab4cfe22
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Sat 2006-08-19 01:40:18 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060818233750-db224a07bf88740b
parent: cfbolz at gmx.de-20060818164215-e4204fb71639c4b9
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Sat 2006-08-19 01:37:50 +0200
message:
Fix docstrings and other things to be PEP 8 compatible. Removed caching of
trees in preparation of using John's mechanism.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060818164215-e4204fb71639c4b9
parent: cfbolz at gmx.de-20060818131652-8b6b88cd26abb88d
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Fri 2006-08-18 18:42:15 +0200
message:
Use the proper functions for constructing trees in benchmarks introduced a
while ago that are also properly cached.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060818131652-8b6b88cd26abb88d
parent: hpk at merlinux.de-20060812155709-ccda6599fc38cead
parent: pqm at pqm.ubuntu.com-20060818114834-a407f02ea4e0337b
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bench_usecases.merge2
timestamp: Fri 2006-08-18 15:16:52 +0200
message:
merge bzr.dev
------------------------------------------------------------
merged: hpk at merlinux.de-20060812155709-ccda6599fc38cead
parent: hpk at merlinux.de-20060812155640-8306a30158d2c5fe
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 15:57:09 +0000
message:
Don't use cache by default.
------------------------------------------------------------
merged: hpk at merlinux.de-20060812155640-8306a30158d2c5fe
parent: hpk at merlinux.de-20060812095539-6acc59da6be3a656
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 15:56:40 +0000
message:
Explicitely generate test functions.
------------------------------------------------------------
merged: hpk at merlinux.de-20060812095539-6acc59da6be3a656
parent: hpk at merlinux.de-20060812093832-8037f88795c2685e
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 09:55:39 +0000
message:
Reverting mutter branch merge.
------------------------------------------------------------
merged: hpk at merlinux.de-20060812093832-8037f88795c2685e
parent: hpk at merlinux.de-20060812090438-68806e5ab6570ca8
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 09:38:32 +0000
message:
Minor doc fix.
------------------------------------------------------------
merged: hpk at merlinux.de-20060812090438-68806e5ab6570ca8
parent: hpk at merlinux.de-20060812090227-0f82e1fd3036e8a8
parent: hpk at merlinux.de-20060811172500-fe5c683e2d0aa01a
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 09:04:38 +0000
message:
Merge bundle benchmarks and resolve conflict.
------------------------------------------------------------
merged: hpk at merlinux.de-20060811172500-fe5c683e2d0aa01a
parent: cfbolz at gmx.de-20060811161207-3e9457ee94acf60b
committer: holger krekel <hpk at merlinux.de>
branch nick: bundle_bench
timestamp: Fri 2006-08-11 17:25:00 +0000
message:
route more creation code through cached_make
and refactor so that apply bundle works from an
empty tree.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060811161207-3e9457ee94acf60b
parent: cfbolz at gmx.de-20060811160236-0ce4b4864fbdb46a
parent: hpk at merlinux.de-20060810175342-d6f2e8eda5f4e85d
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.bundle_bench
timestamp: Fri 2006-08-11 18:12:07 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: hpk at merlinux.de-20060810175342-d6f2e8eda5f4e85d
parent: cfbolz at gmx.de-20060810112841-e9caf337a1a40637
parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
committer: holger krekel <hpk at merlinux.de>
branch nick: bzr.bundle_bench
timestamp: Thu 2006-08-10 19:53:42 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060811160236-0ce4b4864fbdb46a
parent: cfbolz at gmx.de-20060811101748-e3da70773a0ec2d2
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.bundle_bench
timestamp: Fri 2006-08-11 18:02:36 +0200
message:
(cfbolz, hpk): Add caching mechanism and add benchmark for bundle-reading.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060811101748-e3da70773a0ec2d2
parent: cfbolz at gmx.de-20060810112841-e9caf337a1a40637
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.bundle_bench
timestamp: Fri 2006-08-11 12:17:48 +0200
message:
Actually run the benchmarks.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060810112841-e9caf337a1a40637
parent: cfbolz at gmx.de-20060810110353-0bad43599b30e74c
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.bundle_bench
timestamp: Thu 2006-08-10 13:28:41 +0200
message:
low level bundle tests.
------------------------------------------------------------
merged: hpk at merlinux.de-20060812090227-0f82e1fd3036e8a8
parent: cfbolz at gmx.de-20060810110353-0bad43599b30e74c
parent: pqm at pqm.ubuntu.com-20060810061423-3ae5999a70b60211
committer: holger krekel <hpk at merlinux.de>
branch nick: bench_usecases
timestamp: Sat 2006-08-12 09:02:27 +0000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060810110353-0bad43599b30e74c
parent: cfbolz at gmx.de-20060810105504-0e8ed0e503d9200a
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.usecases-bundle
timestamp: Thu 2006-08-10 13:03:53 +0200
message:
Add benchmark for applying a benchmark and fix some formatting/typos.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060810105504-0e8ed0e503d9200a
parent: cfbolz at gmx.de-20060807163103-127425db68843779
parent: jan at merlinux.de-20060719055436-5a67e35c3b3090b5
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: bzr.usecases-bundle
timestamp: Thu 2006-08-10 12:55:04 +0200
message:
Merge Jan's benchmarks.
------------------------------------------------------------
merged: jan at merlinux.de-20060719055436-5a67e35c3b3090b5
parent: jan at merlinux.de-20060719045812-23b43140f27fa081
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 07:54:36 +0200
message:
benchmarks for "bzr bundle --revision ..-1"
------------------------------------------------------------
merged: jan at merlinux.de-20060719045812-23b43140f27fa081
parent: jan at merlinux.de-20060719044851-ec1047597afeafdd
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 06:58:12 +0200
message:
added missing file bench_info.py
somehow bzr add missed the file, probably invoked it in a wrong dir
------------------------------------------------------------
merged: jan at merlinux.de-20060719044851-ec1047597afeafdd
parent: jan at merlinux.de-20060719042908-4f363674ac7c088e
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 06:48:51 +0200
message:
benchmarks for "bzr info" in a kernel like tree
------------------------------------------------------------
merged: jan at merlinux.de-20060719042908-4f363674ac7c088e
parent: jan at merlinux.de-20060719034744-16a75c2ea8bc5ae1
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 06:29:08 +0200
message:
benchmark for "bzr commit single_file" in a kernel like tree
------------------------------------------------------------
merged: jan at merlinux.de-20060719034744-16a75c2ea8bc5ae1
parent: pqm at pqm.ubuntu.com-20060718202456-fc3ad12fe5b7abd0
committer: Jan Balster <jan at merlinux.de>
branch nick: bzr.usecases_bench
timestamp: Wed 2006-07-19 05:47:44 +0200
message:
benchmark for "bzr status single_file" in a kernel like tree
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010030628-7945de26f2489e6f
parent: pqm at pqm.ubuntu.com-20061010021800-16eea9239dba3bbc
parent: john at arbash-meinel.com-20061010022632-ea000675e1d403bf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 04:06:28 +0100
message:
(Cheuksan Edward Wang) cleanup typos in HACKING
------------------------------------------------------------
merged: john at arbash-meinel.com-20061010022632-ea000675e1d403bf
parent: pqm at pqm.ubuntu.com-20061010021800-16eea9239dba3bbc
parent: wang at ubuntu-20061010013213-1987b53af335c1cc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-10-10 12:26:32 +1000
message:
(Cheuksan Edward Wang) cleanup typos in HACKING
------------------------------------------------------------
merged: wang at ubuntu-20061010013213-1987b53af335c1cc
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: wang <wang at ubuntu>
branch nick: test-branch
timestamp: Tue 2006-10-10 09:32:13 +0800
message:
fix typos
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010021800-16eea9239dba3bbc
parent: pqm at pqm.ubuntu.com-20061010020842-000ca42a470f9c7d
parent: john at arbash-meinel.com-20061010001525-84e54e428d10addd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 03:18:00 +0100
message:
(Matthieu Moy) cleanup message when pushing to diverged branch
------------------------------------------------------------
merged: john at arbash-meinel.com-20061010001525-84e54e428d10addd
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: push-to-diverged
timestamp: Mon 2006-10-09 19:15:25 -0500
message:
(Matthieu Moy) cleanup message when pushing to diverged branch
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010020842-000ca42a470f9c7d
parent: pqm at pqm.ubuntu.com-20061010015935-151ca67be6e0bb32
parent: john at arbash-meinel.com-20061009234722-1eb85f62a8944a7f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 03:08:42 +0100
message:
(Mattheiu Moy) correct handling of proxy error
------------------------------------------------------------
merged: john at arbash-meinel.com-20061009234722-1eb85f62a8944a7f
parent: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
parent: Matthieu.Moy at imag.fr-20061007092218-f9b6c5b4025ca023
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2006-10-10 09:47:22 +1000
message:
(Mattheiu Moy) correct handling of proxy error
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20061007092218-f9b6c5b4025ca023
parent: pqm at pqm.ubuntu.com-20060928100633-c8c5bc2d065bfc0d
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.proxy-error
timestamp: Sat 2006-10-07 14:52:18 +0530
message:
correct handling of proxy error
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061010015935-151ca67be6e0bb32
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
parent: john at arbash-meinel.com-20061009234419-e2c1389648de2b74
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-10-10 02:59:35 +0100
message:
(jam) add more startup benchmarks
------------------------------------------------------------
merged: john at arbash-meinel.com-20061009234419-e2c1389648de2b74
parent: pqm at pqm.ubuntu.com-20061005041829-4f10f01c0c5ba3ac
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: startup-benchmarks
timestamp: Mon 2006-10-09 18:44:19 -0500
message:
spin off startup benchmarks to their own branch
More information about the bazaar-commits
mailing list