Rev 1689: Merge benchmark selftests(Robert Collins, Martin Pool),
bzr add chattiness(Robert Collins),
and bzr push revision count reporting improvements(Robert Collins).
in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu May 18 09:53:28 BST 2006
------------------------------------------------------------
revno: 1689
revision-id: pqm at pqm.ubuntu.com-20060518085327-89822346d9321aba
parent: pqm at pqm.ubuntu.com-20060518035414-0eeb99fb74b5436d
parent: robertc at robertcollins.net-20060518084156-518f0123339cbace
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-05-18 09:53:27 +0100
message:
Merge benchmark selftests(Robert Collins, Martin Pool), bzr add chattiness(Robert Collins), and bzr push revision count reporting improvements(Robert Collins).
added:
bzrlib/benchmarks/ benchmarks-20060516055008-ee3f551deeaddadc
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_add.py bench_add.py-20060516064526-6342399b2967266c
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
TODO TODO-20050426050852-44d2ad9048dafbe9
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/TestUtil.py TestUtil.py-20050824080200-5f70140a2d938694
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: robertc at robertcollins.net-20060518084156-518f0123339cbace
parent: robertc at robertcollins.net-20060518082157-34fc7fa5f1dcfe7e
parent: robertc at robertcollins.net-20060515050657-7232e2d1f6895fae
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-05-18 18:41:56 +1000
message:
Make the test test_time_creates_benchmark_in_result more robust to timing variation.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060515050657-7232e2d1f6895fae
parent: robertc at robertcollins.net-20060515045922-1c5ab33f70e633da
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push-branch
timestamp: Mon 2006-05-15 15:06:57 +1000
message:
Show the correct number of revisions pushed when pushing a new branch (Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20060515045922-1c5ab33f70e633da
parent: robertc at robertcollins.net-20060511023227-2e2f141686184d01
parent: pqm at pqm.ubuntu.com-20060512234849-259ff209fff58489
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push-branch
timestamp: Mon 2006-05-15 14:59:22 +1000
message:
Merge integration, fixing test failure in test_too_much due to terminal width changing.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060511023227-2e2f141686184d01
parent: robertc at robertcollins.net-20060509015717-952b5d71d0cc2897
parent: robertc at robertcollins.net-20060511022331-d482c578c078f122
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push-branch
timestamp: Thu 2006-05-11 12:32:27 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060518082157-34fc7fa5f1dcfe7e
parent: robertc at robertcollins.net-20060518080510-f54771ada912624f
parent: robertc at robertcollins.net-20060518072303-246ee1e508d25473
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-05-18 18:21:57 +1000
message:
Merge 'bzr add' verbosity improvements.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060518072303-246ee1e508d25473
parent: robertc at robertcollins.net-20060518071008-96bc24f18116be36
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Thu 2006-05-18 17:23:03 +1000
message:
Add new test_add file - should have been in last commit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060518071008-96bc24f18116be36
parent: robertc at robertcollins.net-20060518004813-4d402a53ede4e8f6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add
timestamp: Thu 2006-05-18 17:10:08 +1000
message:
'bzr add' is now less verbose in telling you what ignore globs were
matched by files being ignored. Instead it just tells you how many were ignored
(because you might reasonably be expecting none to be ignored). 'bzr add -v' is
unchanged and will report every ignored file. (Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20060518080510-f54771ada912624f
parent: robertc at robertcollins.net-20060518073629-cd6cb49e26789ced
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-05-18 18:05:10 +1000
message:
Oops, fixup the blackbox test we started with.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060518073629-cd6cb49e26789ced
parent: pqm at pqm.ubuntu.com-20060518035414-0eeb99fb74b5436d
parent: robertc at robertcollins.net-20060517034051-99158294e1bd6484
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-05-18 17:36:29 +1000
message:
Merge benchmark framework.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060517034051-99158294e1bd6484
parent: robertc at robertcollins.net-20060516081013-91bc18646c941420
committer: Robert Collins <robertc at robertcollins.net>
branch nick: benchmark
timestamp: Wed 2006-05-17 13:40:51 +1000
message:
slightly improve add
------------------------------------------------------------
merged: robertc at robertcollins.net-20060516081013-91bc18646c941420
parent: robertc at robertcollins.net-20060516073416-9de33269c87ae4dc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: benchmark
timestamp: Tue 2006-05-16 18:10:13 +1000
message:
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060516073416-9de33269c87ae4dc
parent: robertc at robertcollins.net-20060516064543-5cb7cc63047ba98b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: benchmark
timestamp: Tue 2006-05-16 17:34:16 +1000
message:
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool).
------------------------------------------------------------
merged: robertc at robertcollins.net-20060516064543-5cb7cc63047ba98b
parent: robertc at robertcollins.net-20060516051622-807a8bbda673f4ee
committer: Robert Collins <robertc at robertcollins.net>
branch nick: benchmark
timestamp: Tue 2006-05-16 16:45:43 +1000
message:
Start on bench_add, an add benchtest.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060516051622-807a8bbda673f4ee
parent: pqm at pqm.ubuntu.com-20060512234849-259ff209fff58489
committer: Robert Collins <robertc at robertcollins.net>
branch nick: benchmark
timestamp: Tue 2006-05-16 15:16:22 +1000
message:
'bzr selftest --benchmark' will run a new benchmarking selftest.
(Robert Collins, Martin Pool).
More information about the bazaar-commits
mailing list