Rev 2766: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository
Robert Collins
robertc at robertcollins.net
Fri Sep 14 03:46:50 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 2766
revision-id: robertc at robertcollins.net-20070914024636-6olqfc532pyt61kl
parent: robertc at robertcollins.net-20070913224646-d5ko1es1ppvdcvs9
parent: robertc at robertcollins.net-20070914021732-q43pb6khebypqnjm
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2007-09-14 12:46:36 +1000
message:
Merge bzr.dev.
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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.14
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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.3
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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.2.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.2
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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.1.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.1
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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.2.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.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
=== added file 'bzrlib/tests/blackbox/test_unknowns.py'
--- a/bzrlib/tests/blackbox/test_unknowns.py 1970-01-01 00:00:00 +0000
+++ b/bzrlib/tests/blackbox/test_unknowns.py 2007-09-05 01:54:07 +0000
@@ -0,0 +1,46 @@
+# Copyright (C) 2007 Canonical Ltd
+# -*- coding: utf-8 -*-
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+"""Black-box tests for 'bzr unknowns', which shows unknown files."""
+
+from bzrlib.tests.blackbox import ExternalBase
+
+class TestUnknowns(ExternalBase):
+
+ def test_unknowns(self):
+ """Test that 'unknown' command reports unknown files"""
+
+ # in empty directory, no unknowns
+ tree = self.make_branch_and_tree('.')
+ self.assertEquals(self.run_bzr('unknowns')[0], '')
+
+ # single unknown file
+ self.build_tree_contents([('a', 'contents of a\n')])
+ self.assertEquals(self.run_bzr('unknowns')[0], 'a\n')
+
+ # multiple unknown files
+ self.build_tree(['b', 'c'])
+ self.assertEquals(self.run_bzr('unknowns')[0], 'a\nb\nc\n')
+
+ # after add, file no longer shown
+ tree.add('a')
+ self.assertEquals(self.run_bzr('unknowns')[0], 'b\nc\n')
+
+ # after all added, none shown
+ tree.add(['b', 'c'])
+ self.assertEquals(self.run_bzr('unknowns')[0], '')
=== modified file 'NEWS'
--- a/NEWS 2007-09-13 22:46:46 +0000
+++ b/NEWS 2007-09-14 02:46:36 +0000
@@ -13,6 +13,9 @@
PERFORMANCE:
+ * Commit in quiet mode is now slightly faster as the information to
+ output is no longer calculated. (Ian Clatworthy)
+
* Inventory serialisation no longer double-sha's the content.
(Robert Collins)
@@ -23,6 +26,16 @@
BUG FIXES:
+ * The basename, not the full path, is now used when checking whether
+ the profiling dump file begins with ``callgrind.out`` or not. This
+ fixes a bug reported by Aaron Bentley on IRC. (Ian Clatworthy)
+
+ * Commands reporting exceptions can now be profiled and still have their
+ data correctly dumped to a file. For example, a ``bzr commit`` with
+ no changes still reports the operation as pointless but doing so no
+ longer throws away the profiling data if this command is run with
+ ``--lsprof-file callgrind.out.ci`` say. (Ian Clatworthy)
+
API BREAKS:
* The ``VersionedFile`` interface now allows content checks to be bypassed
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2007-09-11 00:27:26 +0000
+++ b/bzrlib/builtins.py 2007-09-13 04:28:56 +0000
@@ -2310,16 +2310,11 @@
raise errors.BzrCommandError("empty commit message specified")
return my_message
- if verbose or not is_quiet():
- reporter = ReportCommitToLog()
- else:
- reporter = NullCommitReporter()
-
try:
tree.commit(message_callback=get_message,
specific_files=selected_list,
allow_pointless=unchanged, strict=strict, local=local,
- reporter=reporter, revprops=properties,
+ reporter=None, verbose=verbose, revprops=properties,
author=author)
except PointlessCommit:
# FIXME: This should really happen before the file is read in;
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py 2007-09-05 08:18:57 +0000
+++ b/bzrlib/commands.py 2007-09-10 02:40:07 +0000
@@ -796,6 +796,8 @@
def run_bzr_catch_errors(argv):
+ # Note: The except clause logic below should be kept in sync with the
+ # profile() routine in lsprof.py.
try:
return run_bzr(argv)
except (KeyboardInterrupt, Exception), e:
=== modified file 'bzrlib/commit.py'
--- a/bzrlib/commit.py 2007-09-12 06:33:40 +0000
+++ b/bzrlib/commit.py 2007-09-14 02:46:36 +0000
@@ -72,7 +72,7 @@
is_inside_or_parent_of_any,
quotefn, sha_file, split_lines)
from bzrlib.testament import Testament
-from bzrlib.trace import mutter, note, warning
+from bzrlib.trace import mutter, note, warning, is_quiet
from bzrlib.xml5 import serializer_v5
from bzrlib.inventory import Inventory, InventoryEntry
from bzrlib import symbol_versioning
@@ -108,6 +108,9 @@
def renamed(self, change, old_path, new_path):
pass
+ def is_verbose(self):
+ return False
+
class ReportCommitToLog(NullCommitReporter):
@@ -134,7 +137,7 @@
def completed(self, revno, rev_id):
self._note('Committed revision %d.', revno)
-
+
def deleted(self, file_id):
self._note('deleted %s', file_id)
@@ -147,6 +150,9 @@
def renamed(self, change, old_path, new_path):
self._note('%s %s => %s', change, old_path, new_path)
+ def is_verbose(self):
+ return True
+
class Commit(object):
"""Task of committing a new revision.
@@ -163,12 +169,13 @@
def __init__(self,
reporter=None,
config=None):
- if reporter is not None:
- self.reporter = reporter
- else:
- self.reporter = NullCommitReporter()
+ """Create a Commit object.
+
+ :param reporter: the default reporter to use or None to decide later
+ """
+ self.reporter = reporter
self.config = config
-
+
def commit(self,
message=None,
timestamp=None,
@@ -209,6 +216,8 @@
:param revprops: Properties for new revision
:param local: Perform a local only commit.
+ :param reporter: the reporter to use or None for the default
+ :param verbose: if True and the reporter is not None, report everything
:param recursive: If set to 'down', commit in any subtrees that have
pending changes of any sort during this commit.
"""
@@ -246,11 +255,6 @@
self.strict = strict
self.verbose = verbose
- if reporter is None and self.reporter is None:
- self.reporter = NullCommitReporter()
- elif reporter is not None:
- self.reporter = reporter
-
self.work_tree.lock_write()
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
self.basis_tree = self.work_tree.basis_tree()
@@ -266,6 +270,11 @@
# Check that the working tree is up to date
old_revno, new_revno = self._check_out_of_date_tree()
+ # Complete configuration setup
+ if reporter is not None:
+ self.reporter = reporter
+ elif self.reporter is None:
+ self.reporter = self._select_reporter()
if self.config is None:
self.config = self.branch.get_config()
@@ -369,6 +378,12 @@
self._cleanup()
return self.rev_id
+ def _select_reporter(self):
+ """Select the CommitReporter to use."""
+ if is_quiet():
+ return NullCommitReporter()
+ return ReportCommitToLog()
+
def _any_real_changes(self):
"""Are there real changes between new_inventory and basis?
@@ -671,12 +686,11 @@
self.builder.record_entry_contents(ie, self.parent_invs, path,
self.basis_tree, None)
- # Report what was deleted. We could skip this when no deletes are
- # detected to gain a performance win, but it arguably serves as a
- # 'safety check' by informing the user whenever anything disappears.
- for path, ie in self.basis_inv.iter_entries():
- if ie.file_id not in self.builder.new_inventory:
- self.reporter.deleted(path)
+ # Report what was deleted.
+ if self.reporter.is_verbose():
+ for path, ie in self.basis_inv.iter_entries():
+ if ie.file_id not in self.builder.new_inventory:
+ self.reporter.deleted(path)
def _populate_from_inventory(self, specific_files):
"""Populate the CommitBuilder by walking the working tree inventory."""
@@ -685,6 +699,7 @@
for unknown in self.work_tree.unknowns():
raise StrictCommitFailed()
+ report_changes = self.reporter.is_verbose()
deleted_ids = []
deleted_paths = set()
work_inv = self.work_tree.inventory
@@ -743,7 +758,8 @@
# without it thanks to a unicode normalisation issue. :-(
definitely_changed = kind != existing_ie.kind
self._record_entry(path, file_id, specific_files, kind, name,
- parent_id, definitely_changed, existing_ie, content_summary)
+ parent_id, definitely_changed, existing_ie, report_changes,
+ content_summary)
# Unversion IDs that were found to be deleted
self.work_tree.unversion(deleted_ids)
@@ -774,7 +790,8 @@
return self.work_tree.get_reference_revision(file_id)
def _record_entry(self, path, file_id, specific_files, kind, name,
- parent_id, definitely_changed, existing_ie, content_summary):
+ parent_id, definitely_changed, existing_ie, report_changes,
+ content_summary):
"Record the new inventory entry for a path if any."
# mutter('check %s {%s}', path, file_id)
if (not specific_files or
@@ -795,7 +812,8 @@
if ie is not None:
self.builder.record_entry_contents(ie, self.parent_invs,
path, self.work_tree, content_summary)
- self._report_change(ie, path)
+ if report_changes:
+ self._report_change(ie, path)
return ie
def _report_change(self, ie, path):
=== modified file 'bzrlib/lsprof.py'
--- a/bzrlib/lsprof.py 2007-07-30 01:55:44 +0000
+++ b/bzrlib/lsprof.py 2007-09-10 08:19:29 +0000
@@ -10,6 +10,10 @@
import threading
from _lsprof import Profiler, profiler_entry
+
+import bzrlib.osutils
+
+
__all__ = ['profile', 'Stats']
_g_threadmap = {}
@@ -31,8 +35,17 @@
p = Profiler()
p.enable(subcalls=True)
threading.setprofile(_thread_profile)
+ # Note: The except clause is needed below so that profiling data still
+ # gets dumped even when exceptions are encountered. The except clause code
+ # is taken straight from run_bzr_catch_errrors() in commands.py and ought
+ # to be kept in sync with it.
try:
- ret = f(*args, **kwds)
+ try:
+ ret = f(*args, **kwds)
+ except (KeyboardInterrupt, Exception), e:
+ import bzrlib.trace
+ bzrlib.trace.report_exception(sys.exc_info(), sys.stderr)
+ ret = 3
finally:
p.disable()
for pp in _g_threadmap.values():
@@ -118,10 +131,11 @@
otherwise the format is given by the filename extension.
"""
if format is None:
- if filename.startswith('callgrind.out'):
+ basename = bzrlib.osutils.basename(filename)
+ if basename.startswith('callgrind.out'):
format = "callgrind"
else:
- ext = os.path.splitext(filename)[1]
+ ext = bzrlib.osutils.splitext(filename)[1]
if len(ext) > 1:
format = ext[1:]
outfile = open(filename, 'wb')
=== modified file 'bzrlib/tests/blackbox/__init__.py'
--- a/bzrlib/tests/blackbox/__init__.py 2007-08-16 18:23:13 +0000
+++ b/bzrlib/tests/blackbox/__init__.py 2007-09-05 01:54:07 +0000
@@ -103,6 +103,7 @@
'bzrlib.tests.blackbox.test_testament',
'bzrlib.tests.blackbox.test_too_much',
'bzrlib.tests.blackbox.test_uncommit',
+ 'bzrlib.tests.blackbox.test_unknowns',
'bzrlib.tests.blackbox.test_update',
'bzrlib.tests.blackbox.test_upgrade',
'bzrlib.tests.blackbox.test_version',
=== modified file 'bzrlib/tests/blackbox/test_ignore.py'
--- a/bzrlib/tests/blackbox/test_ignore.py 2007-08-29 09:48:37 +0000
+++ b/bzrlib/tests/blackbox/test_ignore.py 2007-09-05 01:38:34 +0000
@@ -45,7 +45,7 @@
def test_ignore_absolutes(self):
"""'ignore' with an absolute path returns an error"""
- self.run_bzr('init')
+ self.make_branch_and_tree('.')
self.run_bzr_error(('bzr: ERROR: NAME_PATTERN should not '
'be an absolute path\n',),
'ignore /crud')
@@ -64,50 +64,50 @@
self.assertEquals(self.run_bzr('unknowns')[0], 'dir3\n')
def test_ignore_patterns(self):
- self.run_bzr('init')
- self.assertEquals(self.run_bzr('unknowns')[0], '')
+ tree = self.make_branch_and_tree('.')
+
+ self.assertEquals(list(tree.unknowns()), [])
# is_ignored() will now create the user global ignore file
# if it doesn't exist, so make sure we ignore it in our tests
ignores._set_user_ignores(['*.tmp'])
self.build_tree_contents(
- [('foo.tmp', '.tmp files are ignored by default'),
- ])
- self.assertEquals(self.run_bzr('unknowns')[0], '')
-
- file('foo.c', 'wt').write('int main() {}')
- self.assertEquals(self.run_bzr('unknowns')[0], 'foo.c\n')
-
- self.run_bzr('add foo.c')
- self.assertEquals(self.run_bzr('unknowns')[0], '')
+ [('foo.tmp', '.tmp files are ignored by default')])
+ self.assertEquals(list(tree.unknowns()), [])
+
+ self.build_tree_contents([('foo.c', 'int main() {}')])
+ self.assertEquals(list(tree.unknowns()), ['foo.c'])
+
+ tree.add('foo.c')
+ self.assertEquals(list(tree.unknowns()), [])
# 'ignore' works when creating the .bzrignore file
- file('foo.blah', 'wt').write('blah')
- self.assertEquals(self.run_bzr('unknowns')[0], 'foo.blah\n')
+ self.build_tree_contents([('foo.blah', 'blah')])
+ self.assertEquals(list(tree.unknowns()), ['foo.blah'])
self.run_bzr('ignore *.blah')
- self.assertEquals(self.run_bzr('unknowns')[0], '')
+ self.assertEquals(list(tree.unknowns()), [])
self.check_file_contents('.bzrignore', '*.blah\n')
# 'ignore' works when then .bzrignore file already exists
- file('garh', 'wt').write('garh')
- self.assertEquals(self.run_bzr('unknowns')[0], 'garh\n')
+ self.build_tree_contents([('garh', 'garh')])
+ self.assertEquals(list(tree.unknowns()), ['garh'])
self.run_bzr('ignore garh')
- self.assertEquals(self.run_bzr('unknowns')[0], '')
+ self.assertEquals(list(tree.unknowns()), [])
self.check_file_contents('.bzrignore', '*.blah\ngarh\n')
def test_ignore_multiple_arguments(self):
"""'ignore' works with multiple arguments"""
- self.run_bzr('init')
+ tree = self.make_branch_and_tree('.')
self.build_tree(['a','b','c','d'])
- self.assertEquals(self.run_bzr('unknowns')[0], 'a\nb\nc\nd\n')
+ self.assertEquals(list(tree.unknowns()), ['a', 'b', 'c', 'd'])
self.run_bzr('ignore a b c')
- self.assertEquals(self.run_bzr('unknowns')[0], 'd\n')
+ self.assertEquals(list(tree.unknowns()), ['d'])
self.check_file_contents('.bzrignore', 'a\nb\nc\n')
def test_ignore_no_arguments(self):
"""'ignore' with no arguments returns an error"""
- self.run_bzr('init')
+ self.make_branch_and_tree('.')
self.run_bzr_error(('bzr: ERROR: ignore requires at least one '
'NAME_PATTERN or --old-default-rules\n',),
'ignore')
=== modified file 'bzrlib/tests/test_commit.py'
--- a/bzrlib/tests/test_commit.py 2007-08-08 05:43:43 +0000
+++ b/bzrlib/tests/test_commit.py 2007-09-03 13:17:52 +0000
@@ -70,6 +70,9 @@
def renamed(self, change, old_path, new_path):
self.calls.append(('renamed', change, old_path, new_path))
+ def is_verbose(self):
+ return True
+
class TestCommit(TestCaseWithTransport):
=== modified file 'bzrlib/tests/test_lsprof.py'
--- a/bzrlib/tests/test_lsprof.py 2007-06-18 13:55:14 +0000
+++ b/bzrlib/tests/test_lsprof.py 2007-09-10 06:27:40 +0000
@@ -64,7 +64,7 @@
def _tempfile(self, ext):
dir = self.test_dir
- return os.path.join(dir, "tmp_profile_data." + ext)
+ return bzrlib.osutils.pathjoin(dir, "tmp_profile_data." + ext)
def test_stats_save_to_txt(self):
f = self._tempfile("txt")
@@ -77,6 +77,10 @@
self.stats.save(f)
lines = open(f).readlines()
self.assertEqual(lines[0], "events: Ticks\n")
+ f = bzrlib.osutils.pathjoin(self.test_dir, "callgrind.out.foo")
+ self.stats.save(f)
+ lines = open(f).readlines()
+ self.assertEqual(lines[0], "events: Ticks\n")
# Test explicit format nommination
f2 = self._tempfile("txt")
self.stats.save(f2, format="callgrind")
More information about the bazaar-commits
mailing list