Rev 2565: Merge with bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/integration
Robert Collins
robertc at robertcollins.net
Mon Jul 2 06:26:32 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/integration
------------------------------------------------------------
revno: 2565
revision-id: robertc at robertcollins.net-20070702052625-motr7ljwhmqvw9rg
parent: robertc at robertcollins.net-20070702052425-0msyx0beap6klkf9
parent: pqm at pqm.ubuntu.com-20070629150144-xoeghcfb52pit8tv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-07-02 15:26:25 +1000
message:
Merge with bzr.dev.
added:
bzrlib/api.py api.py-20070626082640-35lspz7j0ys7a8ld-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_add.py bench_add.py-20060516064526-6342399b2967266c
bzrlib/benchmarks/bench_bench.py bench_bench.py-20060609084943-2lv2wsi61vhkmj7b-1
bzrlib/benchmarks/bench_cache_utf8.py bench_encoding.py-20060810000746-nv69wfkxei7w2cij-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_inventory.py bench_inventory.py-20060611112709-gjo1kx0oudyo9qbv-1
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
bzrlib/benchmarks/bench_rocks.py bench_rocks.py-20060608120339-3ydxl3v2cori44zb-1
bzrlib/benchmarks/bench_sftp.py bench_sftp.py-20060810114659-67c1edb27503ebde
bzrlib/benchmarks/bench_startup.py bench_startup.py-20061006075337-q49on3zvfcbvarn3-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/benchmarks/bench_transform.py bench_transform.py-20060525041052-ysn0hlw94gcc57lm-1
bzrlib/benchmarks/bench_workingtree.py bench_workingtree.py-20060527061822-cxrgsa9ax2q4d82q-1
bzrlib/benchmarks/bench_xml.py bench_xml.py-20060816202544-ty0p415bb7om5gzd-1
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/test_api.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
------------------------------------------------------------
revno: 2553.1.13
revision-id: pqm at pqm.ubuntu.com-20070629150144-xoeghcfb52pit8tv
parent: pqm at pqm.ubuntu.com-20070629060700-wou1v3btg9otmum4
parent: john at arbash-meinel.com-20070628231809-pqbt7puoqj8bl07b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-29 16:01:44 +0100
message:
(John Arbash Meinel) Improve 'make api-docs' output.
------------------------------------------------------------
revno: 2399.1.17
revision-id: john at arbash-meinel.com-20070628231809-pqbt7puoqj8bl07b
parent: john at arbash-meinel.com-20070428150417-trp3pi0pzd411pu4
parent: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-06-28 18:18:09 -0500
message:
[merge] bzr.dev 2562
------------------------------------------------------------
revno: 2399.1.16
revision-id: john at arbash-meinel.com-20070428150417-trp3pi0pzd411pu4
parent: john at arbash-meinel.com-20070412213307-kuh07cnzaud12wx1
parent: pqm at pqm.ubuntu.com-20070426211103-h84prqh7a4ad3ez2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Sat 2007-04-28 10:04:17 -0500
message:
[merge] bzr.dev 2466
------------------------------------------------------------
revno: 2399.1.15
revision-id: john at arbash-meinel.com-20070412213307-kuh07cnzaud12wx1
parent: john at arbash-meinel.com-20070412203640-z1jld315288moxvy
parent: john at arbash-meinel.com-20070412202742-4cr2qmchdfe9mg7n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 16:33:07 -0500
message:
[merge] api-doc-builder and remove the pydoctor build code for now.
------------------------------------------------------------
revno: 2399.1.14
revision-id: john at arbash-meinel.com-20070412203640-z1jld315288moxvy
parent: john at arbash-meinel.com-20070412194551-r4m6wdhhgz6353sq
parent: pqm at pqm.ubuntu.com-20070412150356-jeie6iap22sae8xf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 15:36:40 -0500
message:
[merge] bzr.dev 2413
------------------------------------------------------------
revno: 2399.1.13
revision-id: john at arbash-meinel.com-20070412194551-r4m6wdhhgz6353sq
parent: john at arbash-meinel.com-20070412193210-ljgiw2au2r7ttx53
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 14:45:51 -0500
message:
Remove BRANCH.TODO info, now that we have make check-api-doc
------------------------------------------------------------
revno: 2399.1.12
revision-id: john at arbash-meinel.com-20070412193210-ljgiw2au2r7ttx53
parent: john at arbash-meinel.com-20070412190236-9izxi311ng5zofvh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 14:32:10 -0500
message:
Add make check-api-docs, which runs epydoc --check, rather than generating output
------------------------------------------------------------
revno: 2399.1.11
revision-id: john at arbash-meinel.com-20070412190236-9izxi311ng5zofvh
parent: john at arbash-meinel.com-20070412184551-3v8sc4zdlrxdb202
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 14:02:36 -0500
message:
Update lazy_import with tests for the new '_should_proxy' variable.
------------------------------------------------------------
revno: 2399.1.10
revision-id: john at arbash-meinel.com-20070412184551-3v8sc4zdlrxdb202
parent: john at arbash-meinel.com-20070412174910-4m93s90gq6tjk1k4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 13:45:51 -0500
message:
fix assertRaises to use the right parameter...
------------------------------------------------------------
revno: 2399.1.9
revision-id: john at arbash-meinel.com-20070412174910-4m93s90gq6tjk1k4
parent: john at arbash-meinel.com-20070409231939-prjmbgzw9fj3zqon
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Thu 2007-04-12 12:49:10 -0500
message:
Since I have epydoc working with lazy imports, make it the default api doc generator.
Also, update Makefile to make it easier to just document one file.
------------------------------------------------------------
revno: 2399.1.8
revision-id: john at arbash-meinel.com-20070409231939-prjmbgzw9fj3zqon
parent: john at arbash-meinel.com-20070409221122-qh66j4pk3kqxjn9c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 18:19:39 -0500
message:
Change lazy_import to allow proxying when necessary.
Write a monkey-patch for epydoc.uid.ObjectUID so that it can understand
a lazy_import object.
With the monkey-patch in place, epydoc seems to be able to process bzrlib.
Now we still need to fix the errors. :)
------------------------------------------------------------
revno: 2399.1.7
revision-id: john at arbash-meinel.com-20070409221122-qh66j4pk3kqxjn9c
parent: john at arbash-meinel.com-20070409212132-23n1qlamaypsbluo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 17:11:22 -0500
message:
Cleanup bzrlib/benchmarks/* so that everything at least has a valid doc string.
------------------------------------------------------------
revno: 2399.1.6
revision-id: john at arbash-meinel.com-20070409212132-23n1qlamaypsbluo
parent: john at arbash-meinel.com-20070409210631-llhncalt7gct9wms
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 16:21:32 -0500
message:
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain.
------------------------------------------------------------
revno: 2399.1.5
revision-id: john at arbash-meinel.com-20070409210631-llhncalt7gct9wms
parent: john at arbash-meinel.com-20070409210437-qdyadcg1orpe5kkh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 16:06:31 -0500
message:
Clean up add.py documentation.
Add doc strings for undocumented functions.
Move documentation to the right location for 'smart_add_tree'
Fix rst documentation (the lines need to be indented for each parameter)
------------------------------------------------------------
revno: 2399.1.4
revision-id: john at arbash-meinel.com-20070409210437-qdyadcg1orpe5kkh
parent: john at arbash-meinel.com-20070409203609-xpvz574u8jj10q36
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 16:04:37 -0500
message:
Add command line invocations for epydoc and pydoctor to generate docs
for a single file.
------------------------------------------------------------
revno: 2399.1.3
revision-id: john at arbash-meinel.com-20070409203609-xpvz574u8jj10q36
parent: john at arbash-meinel.com-20070409203546-7935oty2xm5mj4j8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 15:36:09 -0500
message:
Add a list of documentation failures
------------------------------------------------------------
revno: 2399.1.2
revision-id: john at arbash-meinel.com-20070409203546-7935oty2xm5mj4j8
parent: john at arbash-meinel.com-20070409202547-d2g38oke516pzbin
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 15:35:46 -0500
message:
Add url to bazaar project page in docs
------------------------------------------------------------
revno: 2399.1.1
revision-id: john at arbash-meinel.com-20070409202547-d2g38oke516pzbin
parent: pqm at pqm.ubuntu.com-20070404140524-48cdc6512763399e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: doc-cleanup
timestamp: Mon 2007-04-09 15:25:47 -0500
message:
Update Makefile to add 'make api-docs' using pydoctor
------------------------------------------------------------
revno: 2553.1.12
revision-id: pqm at pqm.ubuntu.com-20070629060700-wou1v3btg9otmum4
parent: pqm at pqm.ubuntu.com-20070629000000-dmkdjthna7njsccg
parent: mbp at sourcefrog.net-20070629053431-ch300idy9tg2x58c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-29 07:07:00 +0100
message:
Change out of the test directory before unlinking it, to avoid permission denied errors on Windows (gzlist)
------------------------------------------------------------
revno: 2553.1.11.1.1
revision-id: mbp at sourcefrog.net-20070629053431-ch300idy9tg2x58c
parent: pqm at pqm.ubuntu.com-20070629000000-dmkdjthna7njsccg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Fri 2007-06-29 15:34:31 +1000
message:
Change out of the test directory before unlinking it, to avoid permission denied errors on Windows (gzlist)
------------------------------------------------------------
revno: 2553.1.11
revision-id: pqm at pqm.ubuntu.com-20070629000000-dmkdjthna7njsccg
parent: pqm at pqm.ubuntu.com-20070628225335-facf1886gxehj2w1
parent: john at arbash-meinel.com-20070628233134-i49poh40mkt2f9i4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-29 01:00:00 +0100
message:
(James Westby) Fix bug #122656 by raising a nice error for 'bzr annotate nonexistant'
------------------------------------------------------------
revno: 2553.1.10.1.1
revision-id: john at arbash-meinel.com-20070628233134-i49poh40mkt2f9i4
parent: pqm at pqm.ubuntu.com-20070628225335-facf1886gxehj2w1
parent: jw+debian at jameswestby.net-20070628205014-sgiw70zcyg2qhl13
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-06-28 18:31:34 -0500
message:
(James Westby) Fix bug #122656 by raising a nice error for 'bzr annotate nonexistant'
------------------------------------------------------------
revno: 2553.1.8.2.2
revision-id: jw+debian at jameswestby.net-20070628205014-sgiw70zcyg2qhl13
parent: jw+debian at jameswestby.net-20070628191100-7jkrxku0fv7n7ju1
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Thu 2007-06-28 21:50:14 +0100
message:
Fix up with comments from Aaron.
------------------------------------------------------------
revno: 2553.1.8.2.1
revision-id: jw+debian at jameswestby.net-20070628191100-7jkrxku0fv7n7ju1
parent: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Thu 2007-06-28 20:11:00 +0100
message:
Display a useful error message when annotating a non-existant file (#122656)
------------------------------------------------------------
revno: 2553.1.10
revision-id: pqm at pqm.ubuntu.com-20070628225335-facf1886gxehj2w1
parent: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
parent: john at arbash-meinel.com-20070628222253-jwbuxy68uox610w3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 23:53:35 +0100
message:
(James Westby) Fix TreeConfig to correctly return options from a section
------------------------------------------------------------
revno: 2553.1.9.1.2
revision-id: john at arbash-meinel.com-20070628222253-jwbuxy68uox610w3
parent: john at arbash-meinel.com-20070628221841-8vu77dl0wytbccyf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-06-28 17:22:53 -0500
message:
Clean up whitespace
------------------------------------------------------------
revno: 2553.1.9.1.1
revision-id: john at arbash-meinel.com-20070628221841-8vu77dl0wytbccyf
parent: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
parent: jw+debian at jameswestby.net-20070618203906-atz57382qnf4sdc0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-06-28 17:18:41 -0500
message:
[merge] James Westby's Fix for TreeConfig returning values from subsections.
------------------------------------------------------------
revno: 2533.1.1
revision-id: jw+debian at jameswestby.net-20070618203906-atz57382qnf4sdc0
parent: pqm at pqm.ubuntu.com-20070618142445-94nnc2l4o1yy6x8l
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Mon 2007-06-18 21:39:06 +0100
message:
Fix TreeConfig to return values from sections.
* TreeConfig would mistakenly search the top level when asked for options
from a section. This patch makes it respect the section argument and only
search the specified section.
* It also adds some more tests, explicity testing the behavior for
both keys that are present and absent in both sections and the top level,
keys that are present in both, default values, and missing sections.
------------------------------------------------------------
revno: 2553.1.9
revision-id: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
parent: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
parent: abentley at panoramicfeedback.com-20070628185324-khiv4n3hrkh60xq5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 20:44:10 +0100
message:
Add a test for check_inventory_shape and fix tests (James Westby)
------------------------------------------------------------
revno: 2553.1.8.1.2
revision-id: abentley at panoramicfeedback.com-20070628185324-khiv4n3hrkh60xq5
parent: abentley at panoramicfeedback.com-20070628185213-6kbbwchwb4zb19ux
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2007-06-28 14:53:24 -0400
message:
Fix indenting in TestCheckInventoryShape
------------------------------------------------------------
revno: 2553.1.8.1.1
revision-id: abentley at panoramicfeedback.com-20070628185213-6kbbwchwb4zb19ux
parent: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
parent: jw+debian at jameswestby.net-20070625200506-lq602is8c6ofwt6b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2007-06-28 14:52:13 -0400
message:
Merge check_shape fixes
------------------------------------------------------------
revno: 2545.3.2
revision-id: jw+debian at jameswestby.net-20070625200506-lq602is8c6ofwt6b
parent: jw+debian at jameswestby.net-20070624211307-tchngkjgvexjrchz
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Mon 2007-06-25 21:05:06 +0100
message:
Add a test for check_inventory_shape.
Also fix up the tests that relied on the buggy behaviour.
------------------------------------------------------------
revno: 2545.3.1
revision-id: jw+debian at jameswestby.net-20070624211307-tchngkjgvexjrchz
parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Sun 2007-06-24 22:13:07 +0100
message:
Fix detection of directory entries in the inventory.
check_inventory_shape allows you to check that an inventory entry is a
directory by ending it in a '/'. However the code to add the '/' to the
entries for comparison uses the kind == 'dir' to detect directories, when
the key is 'directory'.
------------------------------------------------------------
revno: 2553.1.8
revision-id: pqm at pqm.ubuntu.com-20070628082903-b21gad45bimzvmgu
parent: pqm at pqm.ubuntu.com-20070628070827-h5s313dg5tnag9vj
parent: robertc at robertcollins.net-20070628080025-nc7i3aax1hz39dkw
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 09:29:03 +0100
message:
Make debug.debug_flags be isolated for all tests.
------------------------------------------------------------
revno: 2553.1.7.1.3
revision-id: robertc at robertcollins.net-20070628080025-nc7i3aax1hz39dkw
parent: robertc at robertcollins.net-20070628075053-uzqfrh5jvizm2fzf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: debug-test-isolation
timestamp: Thu 2007-06-28 18:00:25 +1000
message:
Allow 'from debug import debug_flags'
------------------------------------------------------------
revno: 2553.1.7.1.2
revision-id: robertc at robertcollins.net-20070628075053-uzqfrh5jvizm2fzf
parent: robertc at robertcollins.net-20070628074823-cj7pcabpm2jrdi7m
committer: Robert Collins <robertc at robertcollins.net>
branch nick: debug-test-isolation
timestamp: Thu 2007-06-28 17:50:53 +1000
message:
Remember NEWS
------------------------------------------------------------
revno: 2553.1.7.1.1
revision-id: robertc at robertcollins.net-20070628074823-cj7pcabpm2jrdi7m
parent: pqm at pqm.ubuntu.com-20070628070827-h5s313dg5tnag9vj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: debug-test-isolation
timestamp: Thu 2007-06-28 17:48:23 +1000
message:
Make debug.debug_flags be isolated for all tests.
------------------------------------------------------------
revno: 2553.1.7
revision-id: pqm at pqm.ubuntu.com-20070628070827-h5s313dg5tnag9vj
parent: pqm at pqm.ubuntu.com-20070628051830-re1rvfieof32tnux
parent: robertc at robertcollins.net-20070628063203-lr39jqb65223ts09
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 08:08:27 +0100
message:
(robertc) Show the names of commit hooks during commit.
------------------------------------------------------------
revno: 2553.2.3
revision-id: robertc at robertcollins.net-20070628063203-lr39jqb65223ts09
parent: robertc at robertcollins.net-20070628032159-ru3ztg712ns2dpip
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-06-28 16:32:03 +1000
message:
Increase docs in response to review feedback.
------------------------------------------------------------
revno: 2553.2.2
revision-id: robertc at robertcollins.net-20070628032159-ru3ztg712ns2dpip
parent: robertc at robertcollins.net-20070628030853-fjeb7ii5euyvi7c1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-hook-names
timestamp: Thu 2007-06-28 13:21:59 +1000
message:
Show hook names during commit.
------------------------------------------------------------
revno: 2553.2.1
revision-id: robertc at robertcollins.net-20070628030853-fjeb7ii5euyvi7c1
parent: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-hook-names
timestamp: Thu 2007-06-28 13:08:53 +1000
message:
Give Hooks names.
------------------------------------------------------------
revno: 2553.1.6
revision-id: pqm at pqm.ubuntu.com-20070628051830-re1rvfieof32tnux
parent: pqm at pqm.ubuntu.com-20070628044459-ycsqzvmdvd2u9r4d
parent: mbp at sourcefrog.net-20070628043955-24gmbiw7luul0d6y
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 06:18:30 +0100
message:
[BUG 119330] Fix tempfile permissions error in smart server tar bundling (under windows) (Martin_)
------------------------------------------------------------
revno: 2553.1.4.1.1
revision-id: mbp at sourcefrog.net-20070628043955-24gmbiw7luul0d6y
parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Thu 2007-06-28 14:39:55 +1000
message:
[BUG 119330] Fix tempfile permissions error in smart server tar bundling (under windows) (Martin_)
------------------------------------------------------------
revno: 2553.1.5
revision-id: pqm at pqm.ubuntu.com-20070628044459-ycsqzvmdvd2u9r4d
parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
parent: robertc at robertcollins.net-20070628025351-m2ljkhum6y81796w
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-28 05:44:59 +0100
message:
(robertc) Document contributing to the performance effort and improve the roadmap dependency .png. (Robert Collins, Vincent Ladeuil)
------------------------------------------------------------
revno: 2541.2.6
revision-id: robertc at robertcollins.net-20070628025351-m2ljkhum6y81796w
parent: robertc at robertcollins.net-20070628025303-qq0wykhge953e0id
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:53:51 +1000
message:
Fix gc graph linkage.
------------------------------------------------------------
revno: 2541.2.5
revision-id: robertc at robertcollins.net-20070628025303-qq0wykhge953e0id
parent: robertc at robertcollins.net-20070628025122-yvcg4br3d7o20kyx
parent: v.ladeuil+lp at free.fr-20070627074736-snyzwqfr6hdf2xh2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:53:03 +1000
message:
Merge Vila's performance.dot tweaks.
------------------------------------------------------------
revno: 2553.1.3.1.1
revision-id: v.ladeuil+lp at free.fr-20070627074736-snyzwqfr6hdf2xh2
parent: pqm at pqm.ubuntu.com-20070627051257-kgk2thfvi2k3k37o
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: perfs
timestamp: Wed 2007-06-27 09:47:36 +0200
message:
Minor cleanup.
* doc/developers/performance.dot:
Use LR rankdir makes the graph easier to read.
* Makefile:
(doc/developers/performance.png): Add echo.
------------------------------------------------------------
revno: 2541.2.4
revision-id: robertc at robertcollins.net-20070628025122-yvcg4br3d7o20kyx
parent: robertc at robertcollins.net-20070628024812-w7idw3rg3hahe9e8
parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:51:22 +1000
message:
Merge more of bzr.dev.
------------------------------------------------------------
revno: 2541.2.3
revision-id: robertc at robertcollins.net-20070628024812-w7idw3rg3hahe9e8
parent: robertc at robertcollins.net-20070628024350-z8bdm0y6yz2uyf4o
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:48:12 +1000
message:
Add GC to the performance.dot file and correct a bug in the performance-roadmap doc file.
------------------------------------------------------------
revno: 2541.2.2
revision-id: robertc at robertcollins.net-20070628024350-z8bdm0y6yz2uyf4o
parent: robertc at robertcollins.net-20070621064107-82v51aa0gpquytwb
parent: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:43:50 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
revno: 2541.2.1
revision-id: robertc at robertcollins.net-20070621064107-82v51aa0gpquytwb
parent: pqm at pqm.ubuntu.com-20070620205507-uuolokc2e0eckrb7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-21 16:41:07 +1000
message:
Document contributing to the performance drive somewhat.
------------------------------------------------------------
revno: 2553.1.4
revision-id: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
parent: pqm at pqm.ubuntu.com-20070627051257-kgk2thfvi2k3k37o
parent: mbp at sourcefrog.net-20070627073753-rrxu5bbux3vi5yda
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-27 09:07:23 +0100
message:
Give a cleaner error when failing to decode knit index entry.
------------------------------------------------------------
revno: 2553.1.2.2.1
revision-id: mbp at sourcefrog.net-20070627073753-rrxu5bbux3vi5yda
parent: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: knit-index-reader
timestamp: Wed 2007-06-27 17:37:53 +1000
message:
Give a cleaner error when failing to decode knit index entry.
------------------------------------------------------------
revno: 2553.1.3
revision-id: pqm at pqm.ubuntu.com-20070627051257-kgk2thfvi2k3k37o
parent: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
parent: mbp at sourcefrog.net-20070627043304-wn1incchxkxa0h2l
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-27 06:12:57 +0100
message:
Remove use of 'assert False' to raise an exception unconditionally
------------------------------------------------------------
revno: 2553.1.2.1.1
revision-id: mbp at sourcefrog.net-20070627043304-wn1incchxkxa0h2l
parent: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Wed 2007-06-27 14:33:04 +1000
message:
Remove use of 'assert False' to raise an exception unconditionally
------------------------------------------------------------
revno: 2553.1.2
revision-id: pqm at pqm.ubuntu.com-20070627023032-h316n5k05g1nqqem
parent: pqm at pqm.ubuntu.com-20070626234309-j6n7rdpbmjjfgicn
parent: mbp at sourcefrog.net-20070627014303-z4ichnqm91hhm4ww
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-27 03:30:32 +0100
message:
Cleanup blackbox tests
------------------------------------------------------------
revno: 2530.3.7
revision-id: mbp at sourcefrog.net-20070627014303-z4ichnqm91hhm4ww
parent: mbp at sourcefrog.net-20070626101529-omfq0howuazwtr3s
parent: pqm at pqm.ubuntu.com-20070626234309-j6n7rdpbmjjfgicn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Wed 2007-06-27 11:43:03 +1000
message:
merge trunk
------------------------------------------------------------
revno: 2530.3.6
revision-id: mbp at sourcefrog.net-20070626101529-omfq0howuazwtr3s
parent: mbp at sourcefrog.net-20070626101427-b8x0vsdg7b1e6f4x
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Tue 2007-06-26 20:15:29 +1000
message:
Remove BzrTestBase alias (little used)
------------------------------------------------------------
revno: 2530.3.5
revision-id: mbp at sourcefrog.net-20070626101427-b8x0vsdg7b1e6f4x
parent: mbp at sourcefrog.net-20070626101233-hrmvl09320gt6b8m
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Tue 2007-06-26 20:14:27 +1000
message:
NEWS on run_bzr changes
------------------------------------------------------------
revno: 2530.3.4
revision-id: mbp at sourcefrog.net-20070626101233-hrmvl09320gt6b8m
parent: mbp at sourcefrog.net-20070626093507-6g30srio9kuy2j0e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Tue 2007-06-26 20:12:33 +1000
message:
Deprecate run_bzr_captured in favour of just run_bzr
------------------------------------------------------------
revno: 2530.3.3
revision-id: mbp at sourcefrog.net-20070626093507-6g30srio9kuy2j0e
parent: mbp at sourcefrog.net-20070626084623-5l1ej6s026urooi1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Tue 2007-06-26 19:35:07 +1000
message:
Clean up some callers that use varargs syntax for run_bzr, but don't
deprecate it yet because it's too widely used.
Separate out _run_bzr_core from _run_bzr_autosplit.
Remove long-deprecated TestCase.merge helper.
------------------------------------------------------------
revno: 2530.3.2
revision-id: mbp at sourcefrog.net-20070626084623-5l1ej6s026urooi1
parent: mbp at sourcefrog.net-20070626080236-14ihgomtffc9tezj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Tue 2007-06-26 18:46:23 +1000
message:
Refactoring run_bzr code into more of a common base.
------------------------------------------------------------
revno: 2530.3.1
revision-id: mbp at sourcefrog.net-20070626080236-14ihgomtffc9tezj
parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Tue 2007-06-26 18:02:36 +1000
message:
Cleanup old variations on run_bzr in the test suite
------------------------------------------------------------
revno: 2553.1.1
revision-id: pqm at pqm.ubuntu.com-20070626234309-j6n7rdpbmjjfgicn
parent: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
parent: robertc at robertcollins.net-20070626224643-50a7lzwugne0d8o0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-27 00:43:09 +0100
message:
(robertc) Export explicit API compatibility for bzrlib.
------------------------------------------------------------
revno: 2550.2.5
revision-id: robertc at robertcollins.net-20070626224643-50a7lzwugne0d8o0
parent: robertc at robertcollins.net-20070626085341-pb8fsoij016itqgf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Wed 2007-06-27 08:46:43 +1000
message:
NEWS entry was incorrectly capitalised.
------------------------------------------------------------
revno: 2550.2.4
revision-id: robertc at robertcollins.net-20070626085341-pb8fsoij016itqgf
parent: robertc at robertcollins.net-20070626085220-iovhwfjflk8vffbh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Tue 2007-06-26 18:53:41 +1000
message:
NEWS.
------------------------------------------------------------
revno: 2550.2.3
revision-id: robertc at robertcollins.net-20070626085220-iovhwfjflk8vffbh
parent: robertc at robertcollins.net-20070626082724-q95taws12ajox2io
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Tue 2007-06-26 18:52:20 +1000
message:
Add require_api API.
------------------------------------------------------------
revno: 2550.2.2
revision-id: robertc at robertcollins.net-20070626082724-q95taws12ajox2io
parent: robertc at robertcollins.net-20070626065720-w0btzadye6lpq104
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Tue 2007-06-26 18:27:24 +1000
message:
Add helpers to get api versions from objects.
------------------------------------------------------------
revno: 2550.2.1
revision-id: robertc at robertcollins.net-20070626065720-w0btzadye6lpq104
parent: pqm at pqm.ubuntu.com-20070625174647-pocypsjmp861qgv7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: api_api
timestamp: Tue 2007-06-26 16:57:20 +1000
message:
API Versioning proposal document.
Diff too large for email (5367 lines, the limit is 1000).
More information about the bazaar-commits
mailing list