Rev 2793: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/commit
Robert Collins
robertc at robertcollins.net
Fri Sep 14 04:43:30 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/commit
------------------------------------------------------------
revno: 2793
revision-id: robertc at robertcollins.net-20070914034315-pyf153e6rrw792z4
parent: robertc at robertcollins.net-20070914000845-qac6s3w4xj41ivmh
parent: pqm at pqm.ubuntu.com-20070914031609-ccdhl0ebzrohpa1t
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Fri 2007-09-14 13:43:15 +1000
message:
Merge bzr.dev.
added:
bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
------------------------------------------------------------
revno: 2776.2.18.1.27
revision-id: pqm at pqm.ubuntu.com-20070914031609-ccdhl0ebzrohpa1t
parent: pqm at pqm.ubuntu.com-20070914020622-8ebz7llponlts1na
parent: robertc at robertcollins.net-20070914021732-q43pb6khebypqnjm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-09-14 04:16:09 +0100
message:
(robertc) Reduce the time to serialise inventories by 20 percent and align the api for knit insertion. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
------------------------------------------------------------
revno: 2776.2.18.1.23.2.2
revision-id: robertc at robertcollins.net-20070914021732-q43pb6khebypqnjm
parent: robertc at robertcollins.net-20070913224138-bjsgijrwe0a2kj4p
parent: pqm at pqm.ubuntu.com-20070914020622-8ebz7llponlts1na
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add_inventory
timestamp: Fri 2007-09-14 12:17:32 +1000
message:
Resolve conflicts in NEWS.
added:
bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
------------------------------------------------------------
revno: 2776.2.18.1.23.2.1
revision-id: robertc at robertcollins.net-20070913224138-bjsgijrwe0a2kj4p
parent: pqm at pqm.ubuntu.com-20070912222627-zvqit350mf6gvrbh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: add_inventory
timestamp: Fri 2007-09-14 08:41:38 +1000
message:
* Inventory serialisation no longer double-sha's the content.
(Robert Collins)
* XML inventory serialisation takes 20% less time while being stricter about
the contents. (Robert Collins)
* Tree's with bad state such as files with no length or sha will no longer
be silently accepted by the repository XML serialiser. To serialise
inventories without such data, pass working=True to write_inventory.
(Robert Collins)
* New method on xml serialisers, write_inventory_to_lines, which matches the
API used by knits for adding content. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
------------------------------------------------------------
revno: 2776.2.18.1.26
revision-id: pqm at pqm.ubuntu.com-20070914020622-8ebz7llponlts1na
parent: pqm at pqm.ubuntu.com-20070914004213-xraql0v7q1p63j81
parent: ian.clatworthy at internode.on.net-20070914004746-momfl0f8ojpgx4wd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-09-14 03:06:22 +0100
message:
Quicker commit in quiet mode (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
------------------------------------------------------------
revno: 2776.2.18.1.25.1.1
revision-id: ian.clatworthy at internode.on.net-20070914004746-momfl0f8ojpgx4wd
parent: pqm at pqm.ubuntu.com-20070914004213-xraql0v7q1p63j81
parent: ian.clatworthy at internode.on.net-20070914001304-1wmnwgv03gs8jaup
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Fri 2007-09-14 10:47:46 +1000
message:
Quicker commit in quiet mode (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
------------------------------------------------------------
revno: 2776.2.13.2.15
revision-id: ian.clatworthy at internode.on.net-20070914001304-1wmnwgv03gs8jaup
parent: ian.clatworthy at internode.on.net-20070913064004-stcfprwpmilbbn6w
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Fri 2007-09-14 10:13:04 +1000
message:
review feedback from lifeless
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2776.2.13.2.14
revision-id: ian.clatworthy at internode.on.net-20070913064004-stcfprwpmilbbn6w
parent: ian.clatworthy at internode.on.net-20070913063840-l3adetq3a1ux5ilb
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Thu 2007-09-13 16:40:04 +1000
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2776.2.13.2.13
revision-id: ian.clatworthy at internode.on.net-20070913063840-l3adetq3a1ux5ilb
parent: ian.clatworthy at internode.on.net-20070913060924-xjmvkr3f64dd7kzd
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Thu 2007-09-13 16:38:40 +1000
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2776.2.13.2.12
revision-id: ian.clatworthy at internode.on.net-20070913060924-xjmvkr3f64dd7kzd
parent: ian.clatworthy at internode.on.net-20070913053627-7pyodcq5oe2qdhhn
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Thu 2007-09-13 16:09:24 +1000
message:
reduce conditionals
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2776.2.13.2.11
revision-id: ian.clatworthy at internode.on.net-20070913053627-7pyodcq5oe2qdhhn
parent: ian.clatworthy at internode.on.net-20070913050216-yi2jip6ztyeff28u
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Thu 2007-09-13 15:36:27 +1000
message:
remove more reporting stuff
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
------------------------------------------------------------
revno: 2776.2.13.2.10
revision-id: ian.clatworthy at internode.on.net-20070913050216-yi2jip6ztyeff28u
parent: ian.clatworthy at internode.on.net-20070913042856-d67uq0wj4g5t7w74
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Thu 2007-09-13 15:02:16 +1000
message:
focus on performance gains, not better reporting
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2776.2.13.2.9
revision-id: ian.clatworthy at internode.on.net-20070913042856-d67uq0wj4g5t7w74
parent: ian.clatworthy at internode.on.net-20070910033531-0rttlqdlqm4hm4l7
parent: pqm at pqm.ubuntu.com-20070912222627-zvqit350mf6gvrbh
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Thu 2007-09-13 14:28:56 +1000
message:
merge bzr.dev
added:
bzrlib/tests/commands/test_update.py test_update.py-20070910091045-8uyp8v73j926l1g2-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2776.2.13.2.8
revision-id: ian.clatworthy at internode.on.net-20070910033531-0rttlqdlqm4hm4l7
parent: ian.clatworthy at internode.on.net-20070906072444-yn7zm81vb1ubrp82
parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Mon 2007-09-10 13:35:31 +1000
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2776.2.13.2.7
revision-id: ian.clatworthy at internode.on.net-20070906072444-yn7zm81vb1ubrp82
parent: ian.clatworthy at internode.on.net-20070904080841-yp1yysxknknmhkzd
parent: pqm at pqm.ubuntu.com-20070906050530-q58gvki4dedc4i6e
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Thu 2007-09-06 17:24:44 +1000
message:
merge bzr.dev including updates to test_commit
added:
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/patiencediff.py patiencediff.py-20070721205536-jz8gaykeb7xtampk-1
renamed:
bzrlib/patiencediff.py => bzrlib/_patiencediff_py.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
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/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
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_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/workingtree_implementations/test_executable.py test_executable.py-20060628162557-tr7h57kl80l3ma8i-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/_patiencediff_py.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
------------------------------------------------------------
revno: 2776.2.13.2.6
revision-id: ian.clatworthy at internode.on.net-20070904080841-yp1yysxknknmhkzd
parent: ian.clatworthy at internode.on.net-20070904075925-l3c1jw2rzuut89zb
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Tue 2007-09-04 18:08:41 +1000
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2776.2.13.2.5
revision-id: ian.clatworthy at internode.on.net-20070904075925-l3c1jw2rzuut89zb
parent: ian.clatworthy at internode.on.net-20070904064951-t4833s0vn5hfq1qu
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Tue 2007-09-04 17:59:25 +1000
message:
Upgrade commit tests to reflect new reporting formats
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
------------------------------------------------------------
revno: 2776.2.13.2.4
revision-id: ian.clatworthy at internode.on.net-20070904064951-t4833s0vn5hfq1qu
parent: ian.clatworthy at internode.on.net-20070904044759-rlb8qd7xpwa99r37
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Tue 2007-09-04 16:49:51 +1000
message:
make change reporting smarter for initial commit
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2776.2.13.2.3
revision-id: ian.clatworthy at internode.on.net-20070904044759-rlb8qd7xpwa99r37
parent: ian.clatworthy at internode.on.net-20070903132434-z3fw269kp97l9355
parent: pqm at pqm.ubuntu.com-20070904035759-iv4xl6d7ez69txba
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Tue 2007-09-04 14:47:59 +1000
message:
merge bzr.dev
added:
bzrlib/benchmarks/bench_pack.py bench_pack.py-20070903042947-0wphp878xr6wkw7t-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
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_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 2776.2.13.2.2
revision-id: ian.clatworthy at internode.on.net-20070903132434-z3fw269kp97l9355
parent: ian.clatworthy at internode.on.net-20070903131752-va6227ax1vj8b9pb
parent: pqm at pqm.ubuntu.com-20070903130729-qdcrag0a7vcpzfgm
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Mon 2007-09-03 23:24:34 +1000
message:
Merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
------------------------------------------------------------
revno: 2776.2.13.2.1
revision-id: ian.clatworthy at internode.on.net-20070903131752-va6227ax1vj8b9pb
parent: pqm at pqm.ubuntu.com-20070903110923-pj5pw0wsf1u922j9
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-less-verbose
timestamp: Mon 2007-09-03 23:17:52 +1000
message:
Make commit less verbose by default
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
------------------------------------------------------------
revno: 2776.2.18.1.25
revision-id: pqm at pqm.ubuntu.com-20070914004213-xraql0v7q1p63j81
parent: pqm at pqm.ubuntu.com-20070913193317-hi3rhwxhbrviw7hz
parent: ian.clatworthy at internode.on.net-20070913231640-rd98wg24ma9hrma4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-09-14 01:42:13 +0100
message:
profiling fixes - basename checking and exceptions now caught
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
------------------------------------------------------------
revno: 2776.2.18.1.24.1.1
revision-id: ian.clatworthy at internode.on.net-20070913231640-rd98wg24ma9hrma4
parent: pqm at pqm.ubuntu.com-20070913193317-hi3rhwxhbrviw7hz
parent: ian.clatworthy at internode.on.net-20070910081929-9419oqg1zhva4e7d
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Fri 2007-09-14 09:16:40 +1000
message:
profiling fixes - basename checking and exceptions now caught
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
------------------------------------------------------------
revno: 2776.2.18.1.11.7.6
revision-id: ian.clatworthy at internode.on.net-20070910081929-9419oqg1zhva4e7d
parent: ian.clatworthy at internode.on.net-20070910062740-kkj4776w6snhf0vl
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.profiling-fixes
timestamp: Mon 2007-09-10 18:19:29 +1000
message:
put back KeyboardInterrupt trapping as needed for Python 2.5
modified:
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
------------------------------------------------------------
revno: 2776.2.18.1.11.7.5
revision-id: ian.clatworthy at internode.on.net-20070910062740-kkj4776w6snhf0vl
parent: ian.clatworthy at internode.on.net-20070910062331-j985z2fu9amnylcq
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.profiling-fixes
timestamp: Mon 2007-09-10 16:27:40 +1000
message:
more win32 path friendliness
modified:
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
------------------------------------------------------------
revno: 2776.2.18.1.11.7.4
revision-id: ian.clatworthy at internode.on.net-20070910062331-j985z2fu9amnylcq
parent: ian.clatworthy at internode.on.net-20070910025614-ftu45ff34xphqr4b
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.profiling-fixes
timestamp: Mon 2007-09-10 16:23:31 +1000
message:
incorporate feedback from lifeless
modified:
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
------------------------------------------------------------
revno: 2776.2.18.1.11.7.3
revision-id: ian.clatworthy at internode.on.net-20070910025614-ftu45ff34xphqr4b
parent: ian.clatworthy at internode.on.net-20070910024907-ri37q9rrkuv1rapq
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.profiling-fixes
timestamp: Mon 2007-09-10 12:56:14 +1000
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2776.2.18.1.11.7.2
revision-id: ian.clatworthy at internode.on.net-20070910024907-ri37q9rrkuv1rapq
parent: ian.clatworthy at internode.on.net-20070910024007-qeqapxc91bqwhe0q
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.profiling-fixes
timestamp: Mon 2007-09-10 12:49:07 +1000
message:
use basename, not full path, when checking for callgrind.out file prefix
modified:
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
------------------------------------------------------------
revno: 2776.2.18.1.11.7.1
revision-id: ian.clatworthy at internode.on.net-20070910024007-qeqapxc91bqwhe0q
parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.profiling-fixes
timestamp: Mon 2007-09-10 12:40:07 +1000
message:
Dump profiling data even when exceptions are encountered
modified:
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
------------------------------------------------------------
revno: 2776.2.18.1.24
revision-id: pqm at pqm.ubuntu.com-20070913193317-hi3rhwxhbrviw7hz
parent: pqm at pqm.ubuntu.com-20070912222627-zvqit350mf6gvrbh
parent: abentley at panoramicfeedback.com-20070913183122-p0s7t241mh4748qr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-09-13 20:33:17 +0100
message:
Clean up test_ignored, add test_unknowns (Daniel Watkins)
added:
bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
modified:
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
------------------------------------------------------------
revno: 2776.2.18.1.23.1.1
revision-id: abentley at panoramicfeedback.com-20070913183122-p0s7t241mh4748qr
parent: pqm at pqm.ubuntu.com-20070912222627-zvqit350mf6gvrbh
parent: d.m.watkins at warwick.ac.uk-20070905015407-ryd91uirbw58fiei
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2007-09-13 14:31:22 -0400
message:
merge from Daniel
added:
bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
modified:
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
------------------------------------------------------------
revno: 2776.2.18.1.1.2.2
revision-id: d.m.watkins at warwick.ac.uk-20070905015407-ryd91uirbw58fiei
parent: d.m.watkins at warwick.ac.uk-20070905013834-mkd7qh0z8xco253m
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: fix_blackbox_test_i
timestamp: Wed 2007-09-05 02:54:07 +0100
message:
Added tests.blackbox.test_unknowns.
added:
bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
modified:
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
------------------------------------------------------------
revno: 2776.2.18.1.1.2.1
revision-id: d.m.watkins at warwick.ac.uk-20070905013834-mkd7qh0z8xco253m
parent: pqm at pqm.ubuntu.com-20070905001648-0iigag4tq1u8mywn
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: fix_blackbox_test_i
timestamp: Wed 2007-09-05 02:38:34 +0100
message:
Updated tests in tests.blackbox.test_ignore to use bzr internals where appropriate.
modified:
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
Diff too large for email (1015 lines, the limit is 1000).
More information about the bazaar-commits
mailing list