Rev 3205: Merge bzr.dev to resolve conflicts with register-branch NEWS items. in http://people.ubuntu.com/~robertc/baz2.0/register-branch.public_location
Robert Collins
robertc at robertcollins.net
Fri Feb 1 04:01:45 GMT 2008
At http://people.ubuntu.com/~robertc/baz2.0/register-branch.public_location
------------------------------------------------------------
revno: 3205
revision-id:robertc at robertcollins.net-20080201040133-7gc0fxqh3b8ot84x
parent: robertc at robertcollins.net-20080201035953-zxrnzhnb1xv0nolj
parent: pqm at pqm.ubuntu.com-20080130212051-utcw5p2zydlq6ntb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: register-branch.public_location
timestamp: Fri 2008-02-01 15:01:33 +1100
message:
Merge bzr.dev to resolve conflicts with register-branch NEWS items.
removed:
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3200.1.9
revision-id:pqm at pqm.ubuntu.com-20080130212051-utcw5p2zydlq6ntb
parent: pqm at pqm.ubuntu.com-20080130194701-iykyel7v3q52qsol
parent: john at arbash-meinel.com-20080130184147-l30omu7r7cln13at
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-30 21:20:51 +0000
message:
(jam) Optimize 'annotate' code path
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
------------------------------------------------------------
revno: 3180.2.4
revision-id:john at arbash-meinel.com-20080130184147-l30omu7r7cln13at
parent: john at arbash-meinel.com-20080130181142-mmgn0wrdvxu38ba5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: optim_annotate
timestamp: Wed 2008-01-30 12:41:47 -0600
message:
NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3180.2.3
revision-id:john at arbash-meinel.com-20080130181142-mmgn0wrdvxu38ba5
parent: john at arbash-meinel.com-20080130181024-fu7u323c9paee4n5
parent: pqm at pqm.ubuntu.com-20080130100306-p0uqnxt3hodnyiej
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: optim_annotate
timestamp: Wed 2008-01-30 12:11:42 -0600
message:
[merge] bzr.dev 3207
removed:
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
added:
doc/en/user-guide/revnos.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
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_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-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_http.py testhttp.py-20051018020158-b2eef6e867c514d9
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_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
------------------------------------------------------------
revno: 3180.2.2
revision-id:john at arbash-meinel.com-20080130181024-fu7u323c9paee4n5
parent: john at arbash-meinel.com-20080124225422-atibw1m93vdmtjw9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: optim_annotate
timestamp: Wed 2008-01-30 12:10:24 -0600
message:
Fix typo, (thanks Ian)
modified:
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
------------------------------------------------------------
revno: 3180.2.1
revision-id:john at arbash-meinel.com-20080124225422-atibw1m93vdmtjw9
parent: pqm at pqm.ubuntu.com-20080115003405-jfuumkpctmvl2e4r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: optim_annotate
timestamp: Thu 2008-01-24 16:54:22 -0600
message:
Change reannotate to special case the 2-parent case.
This allows a few cheap optimizations which saves a lot of time for annotate.
modified:
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
------------------------------------------------------------
revno: 3200.1.8
revision-id:pqm at pqm.ubuntu.com-20080130194701-iykyel7v3q52qsol
parent: pqm at pqm.ubuntu.com-20080130100306-p0uqnxt3hodnyiej
parent: john at arbash-meinel.com-20080130180731-oq4t83eju0t15wzq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-30 19:47:01 +0000
message:
(jam, #185458) Switch from NFKC => NFC for normalization checks.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/test_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
------------------------------------------------------------
revno: 3200.1.1.1.3
revision-id:john at arbash-meinel.com-20080130180731-oq4t83eju0t15wzq
parent: john at arbash-meinel.com-20080128224125-d88zoykrfspon9z5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: nfc
timestamp: Wed 2008-01-30 12:07:31 -0600
message:
NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3200.1.1.1.2
revision-id:john at arbash-meinel.com-20080128224125-d88zoykrfspon9z5
parent: jameinel at samus-20080128165952-nqybfnus41chsd4x
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: nfc
timestamp: Mon 2008-01-28 16:41:25 -0600
message:
Test needs to be updated now that µ is allowed.
modified:
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
------------------------------------------------------------
revno: 3200.1.1.1.1
revision-id:jameinel at samus-20080128165952-nqybfnus41chsd4x
parent: pqm at pqm.ubuntu.com-20080125195940-iwy2onaiiges6k4t
committer: jameinel <jameinel at SAMUS>
branch nick: nfc
timestamp: Mon 2008-01-28 10:59:52 -0600
message:
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC
modified:
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/test_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
------------------------------------------------------------
revno: 3200.1.7
revision-id:pqm at pqm.ubuntu.com-20080130100306-p0uqnxt3hodnyiej
parent: pqm at pqm.ubuntu.com-20080130074652-2t36df3w0l3jhwyf
parent: v.ladeuil+lp at free.fr-20080130082023-15b8pg5idmk7pnun
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-30 10:03:06 +0000
message:
(vila) Fix 123363 by deleting useless log files and test work dirs in
/tmp
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3200.1.6.1.1
revision-id:v.ladeuil+lp at free.fr-20080130082023-15b8pg5idmk7pnun
parent: pqm at pqm.ubuntu.com-20080130074652-2t36df3w0l3jhwyf
parent: v.ladeuil+lp at free.fr-20080130081525-i47iawe2ghcowoxt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Wed 2008-01-30 09:20:23 +0100
message:
Fix 123363 by deleting useless log files and test work dirs in /tmp
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3199.1.9
revision-id:v.ladeuil+lp at free.fr-20080130081525-i47iawe2ghcowoxt
parent: v.ladeuil+lp at free.fr-20080129170643-rz3wt7z5ryw0s4se
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 123363-tmp-pollution
timestamp: Wed 2008-01-30 09:15:25 +0100
message:
Aaron's review feedback.
* bzrlib/builtins.py:
(cmd_merge._do_preview): Ensure the TransformPreview.finalize is
always called.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3199.1.8
revision-id:v.ladeuil+lp at free.fr-20080129170643-rz3wt7z5ryw0s4se
parent: v.ladeuil+lp at free.fr-20080129160337-txsu01vjnpipm5bd
parent: pqm at pqm.ubuntu.com-20080129045844-u41ywp910i6jv8bz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 123363-tmp-pollution
timestamp: Tue 2008-01-29 18:06:43 +0100
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3199.1.7
revision-id:v.ladeuil+lp at free.fr-20080129160337-txsu01vjnpipm5bd
parent: v.ladeuil+lp at free.fr-20080129155823-1ext6bebc09p9rvx
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 123363-tmp-pollution
timestamp: Tue 2008-01-29 17:03:37 +0100
message:
Update NEWS.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3199.1.6
revision-id:v.ladeuil+lp at free.fr-20080129155823-1ext6bebc09p9rvx
parent: v.ladeuil+lp at free.fr-20080129151631-vqjd13tb405mobx6
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 123363-tmp-pollution
timestamp: Tue 2008-01-29 16:58:23 +0100
message:
Fiz last leaking tmp dir.
* bzrlib/tests/test_diff.py:
(TestDiffFromTool.test_from_string): Split the test and cleanup.
modified:
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3199.1.5
revision-id:v.ladeuil+lp at free.fr-20080129151631-vqjd13tb405mobx6
parent: v.ladeuil+lp at free.fr-20080129132736-nai2jpv02r2wltgc
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 123363-tmp-pollution
timestamp: Tue 2008-01-29 16:16:31 +0100
message:
Fix two more leaking tmp dirs, by reworking TransformPreview lock handling.
* bzrlib/tests/test_transform.py:
(TestTransformMerge): Revert previous patch and cleanly call
preview.finalize now that we can.
* bzrlib/tests/test_merge.py:
(TestMerge.test_make_preview_transform): Catch TransformPreview
leak.
* bzrlib/builtins.py:
(cmd_merge._do_preview): Finalize the TransformPreview or the
limbodir will stay in /tmp.
* bzrlib/transform.py:
(TreeTransformBase.__init__): Create the _deletiondir since it's
reffered to by finalize.
(TreeTransformBase.finalize): Delete the dir only if _deletiondir
is set.
(TreeTransform.__init__): Use a temp var for deletiondir and set
the attribute after the base class __init__ has been called.
(TransformPreview.__init__): Read locks the tree since finalize
wants to unlock it (as suggested by Aaron).
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3199.1.4
revision-id:v.ladeuil+lp at free.fr-20080129132736-nai2jpv02r2wltgc
parent: v.ladeuil+lp at free.fr-20080129115331-n7nl3ljtkepljzwi
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 123363-tmp-pollution
timestamp: Tue 2008-01-29 14:27:36 +0100
message:
Fix 16 leaked tmp dirs. Probably indicates a lock handling problem with TransformPreview
* bzrlib/tests/test_transform.py:
(addPreviewCleanup): New method cleaning the TransformPreview
limbdodir leaked by the tests.
* bzrlib/transform.py:
(TransformPreview.__init__): Use a specific prefix for the
limbodir to make leaks more obvious.
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3199.1.3
revision-id:v.ladeuil+lp at free.fr-20080129115331-n7nl3ljtkepljzwi
parent: v.ladeuil+lp at free.fr-20080129084053-sunwf549ox6zczqr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 123363-tmp-pollution
timestamp: Tue 2008-01-29 12:53:31 +0100
message:
Fix two more leaked tmp dirs.
* bzrlib/tests/blackbox/test_outside_wt.py:
(TestOutsideWT.test_cwd_log,
TestOutsideWT.test_diff_outside_tree): Clean up tmp dir.
modified:
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
------------------------------------------------------------
revno: 3199.1.2
revision-id:v.ladeuil+lp at free.fr-20080129084053-sunwf549ox6zczqr
parent: v.ladeuil+lp at free.fr-20080129082119-gerd998iwffytp6i
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 123363-tmp-pollution
timestamp: Tue 2008-01-29 09:40:53 +0100
message:
Fix two more leaked log files.
* bzrlib/tests/test_http.py:
(TestHttpProxyWhiteBox.tearDown): Call the base class tearDown.
modified:
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
------------------------------------------------------------
revno: 3199.1.1
revision-id:v.ladeuil+lp at free.fr-20080129082119-gerd998iwffytp6i
parent: pqm at pqm.ubuntu.com-20080123180146-9pkott489spjwv8q
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 123363-tmp-pollution
timestamp: Tue 2008-01-29 09:21:19 +0100
message:
Get rid of ~1000 useless log files out of 10.000 tests in /tmp.
* bzrlib/tests/test_selftest.py:
(TestRunner.test_skipped_log_deleted,
TestRunner.test_not_aplicable_log_deleted,
TestRunner.test_known_failure_log_deleted): Add tests checking
that the log is deleted for skipped, not applicable and known
failures tests.
* bzrlib/tests/__init__.py:
(ExtendedTestResult.addError, ExtendedTestResult.addFailure,
ExtendedTestResult.addSuccess): Keep log only on true failures and
errors.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3200.1.6
revision-id:pqm at pqm.ubuntu.com-20080130074652-2t36df3w0l3jhwyf
parent: pqm at pqm.ubuntu.com-20080130061143-ek1afpxqoq89jbp6
parent: aaron at aaronbentley.com-20080130042333-38mz446p5c0ve04a
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-30 07:46:52 +0000
message:
Remove multiparent plugin
removed:
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 3200.1.4.2.1
revision-id:aaron at aaronbentley.com-20080130042333-38mz446p5c0ve04a
parent: pqm at pqm.ubuntu.com-20080129045844-u41ywp910i6jv8bz
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzr.mpplugin
timestamp: Tue 2008-01-29 23:23:33 -0500
message:
Remove multiparent plugin
removed:
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 3200.1.5
revision-id:pqm at pqm.ubuntu.com-20080130061143-ek1afpxqoq89jbp6
parent: pqm at pqm.ubuntu.com-20080129045844-u41ywp910i6jv8bz
parent: ian.clatworthy at internode.on.net-20080130043452-rs3cakuycsw5oz5w
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-01-30 06:11:43 +0000
message:
Fix error handling in insert_data_stream (Lukas Lalinsky)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3200.1.4.1.2
revision-id:ian.clatworthy at internode.on.net-20080130043452-rs3cakuycsw5oz5w
parent: ian.clatworthy at internode.on.net-20080129065651-a333d6eqoxt5bu69
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Wed 2008-01-30 14:34:52 +1000
message:
Fix error handling in insert_data_stream (Lukas Lalinsky)
modified:
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3200.1.4.1.1
revision-id:ian.clatworthy at internode.on.net-20080129065651-a333d6eqoxt5bu69
parent: pqm at pqm.ubuntu.com-20080129045844-u41ywp910i6jv8bz
parent: lalinsky at gmail.com-20080115162718-2o7n2budp0udkgi1
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2008-01-29 16:56:51 +1000
message:
Fix error handling in insert_data_stream (Lukas Lalinsky)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3184.2.2
revision-id:lalinsky at gmail.com-20080115162718-2o7n2budp0udkgi1
parent: lalinsky at gmail.com-20080115162643-2pwhszuytol39cd7
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: insert_data_stream
timestamp: Tue 2008-01-15 17:27:18 +0100
message:
Remove duplicate HeadsCache
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
------------------------------------------------------------
revno: 3184.2.1
revision-id:lalinsky at gmail.com-20080115162643-2pwhszuytol39cd7
parent: pqm at pqm.ubuntu.com-20080115141934-3vujw0up5rc8e0gn
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: insert_data_stream
timestamp: Tue 2008-01-15 17:26:43 +0100
message:
Fix handling of some error cases in insert_data_stream
- It always fails for pack and remote repositories, because they return parents as tuples and bdecode returns lists.
- It tries to use undefined RepositoryDataStreamError in case of invalid stream item key.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3200.1.4
revision-id:pqm at pqm.ubuntu.com-20080129045844-u41ywp910i6jv8bz
parent: pqm at pqm.ubuntu.com-20080129012127-1xxr6h8khunihsdx
parent: mbp at sourcefrog.net-20080129032252-ub1r7pug3agdts61
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-01-29 04:58:44 +0000
message:
Remove unnecessary decorators from add_inventory and add_revision
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3200.1.3.1.1
revision-id:mbp at sourcefrog.net-20080129032252-ub1r7pug3agdts61
parent: pqm at pqm.ubuntu.com-20080129012127-1xxr6h8khunihsdx
parent: mbp at sourcefrog.net-20071026103103-wc6bbhubtbjcby9n
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup_locks
timestamp: Tue 2008-01-29 14:22:52 +1100
message:
Remove unnecessary decorators from add_inventory and add_revision
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 2940.4.1
revision-id:mbp at sourcefrog.net-20071026103103-wc6bbhubtbjcby9n
parent: pqm at pqm.ubuntu.com-20071025022746-ftudwmzir8v2lccc
committer: mbp at sourcefrog.net
branch nick: cleanup
timestamp: Fri 2007-10-26 06:31:03 -0400
message:
Remove write lock decorators from add_inventory and add_revision
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3200.1.3
revision-id:pqm at pqm.ubuntu.com-20080129012127-1xxr6h8khunihsdx
parent: pqm at pqm.ubuntu.com-20080128234850-jaxf44mvz2q8m2v5
parent: bialix at ukr.net-20080128221331-8g8jy7fgd30uc0dt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-01-29 01:21:27 +0000
message:
(bialix) List possible values for BZR_SSH environment variable in
env-variables help topic. (#181842)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3193.4.2
revision-id:bialix at ukr.net-20080128221331-8g8jy7fgd30uc0dt
parent: bialix at ukr.net-20080128085958-md3v4ij6mpuglvs4
parent: pqm at pqm.ubuntu.com-20080125195940-iwy2onaiiges6k4t
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bzr_ssh.help
timestamp: Tue 2008-01-29 00:13:31 +0200
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
------------------------------------------------------------
revno: 3193.4.1
revision-id:bialix at ukr.net-20080128085958-md3v4ij6mpuglvs4
parent: pqm at pqm.ubuntu.com-20080118055224-sskoia4bcpxd8wzu
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bzr_ssh.help
timestamp: Mon 2008-01-28 10:59:58 +0200
message:
List possible values for BZR_SSH environment variable in env-variables help topic. (#181842)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3200.1.2
revision-id:pqm at pqm.ubuntu.com-20080128234850-jaxf44mvz2q8m2v5
parent: pqm at pqm.ubuntu.com-20080125195940-iwy2onaiiges6k4t
parent: bialix at ukr.net-20080128220453-hrb3yb1v8y3u52pq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-01-28 23:48:50 +0000
message:
(bialix) List possible values for BZR_SSH environment variable in
env-variables help topic. (#181842)
modified:
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
------------------------------------------------------------
revno: 3193.3.3
revision-id:bialix at ukr.net-20080128220453-hrb3yb1v8y3u52pq
parent: bialix at ukr.net-20080128150314-ful6toglzzq7drx2
parent: pqm at pqm.ubuntu.com-20080125195940-iwy2onaiiges6k4t
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: st.short
timestamp: Tue 2008-01-29 00:04:53 +0200
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
------------------------------------------------------------
revno: 3193.3.2
revision-id:bialix at ukr.net-20080128150314-ful6toglzzq7drx2
parent: bialix at ukr.net-20080128084459-1algjfge3awz8ypu
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: st.short
timestamp: Mon 2008-01-28 17:03:14 +0200
message:
better formatting of pending merges (short/no-short): actual length of prefix is used
modified:
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
------------------------------------------------------------
revno: 3193.3.1
revision-id:bialix at ukr.net-20080128084459-1algjfge3awz8ypu
parent: pqm at pqm.ubuntu.com-20080118055224-sskoia4bcpxd8wzu
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: st.short
timestamp: Mon 2008-01-28 10:44:59 +0200
message:
fit very long revision summary to terminal_width-1 for show_pending_merges(short=True).
modified:
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
------------------------------------------------------------
revno: 3200.1.1
revision-id:pqm at pqm.ubuntu.com-20080125195940-iwy2onaiiges6k4t
parent: pqm at pqm.ubuntu.com-20080124050323-gsgsp2em7v1ugtnz
parent: bialix at ukr.net-20080125181906-hnbj8fkesuxz94bc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-01-25 19:59:40 +0000
message:
(bialix) new formatting of `bzr plugins` output.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
------------------------------------------------------------
revno: 3193.2.4
revision-id:bialix at ukr.net-20080125181906-hnbj8fkesuxz94bc
parent: bialix at ukr.net-20080121233447-2iw2a1jcj0gs1f9f
parent: pqm at pqm.ubuntu.com-20080124050323-gsgsp2em7v1ugtnz
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: plugins.output
timestamp: Fri 2008-01-25 20:19:06 +0200
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
------------------------------------------------------------
revno: 3193.2.3
revision-id:bialix at ukr.net-20080121233447-2iw2a1jcj0gs1f9f
parent: bialix at ukr.net-20080121110518-6i2xovfoqjjh75nr
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: plugins.output
timestamp: Tue 2008-01-22 01:34:47 +0200
message:
another formatting variant suggested by John Meinel.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3193.2.2
revision-id:bialix at ukr.net-20080121110518-6i2xovfoqjjh75nr
parent: bialix at ukr.net-20080121104632-ipdnpm6z4k5piv3q
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: plugins.output
timestamp: Mon 2008-01-21 13:05:18 +0200
message:
new formatting of `bzr plugins` output.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3193.2.1
revision-id:bialix at ukr.net-20080121104632-ipdnpm6z4k5piv3q
parent: pqm at pqm.ubuntu.com-20080118055224-sskoia4bcpxd8wzu
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: plugins.output
timestamp: Mon 2008-01-21 12:46:32 +0200
message:
show path to plugin module as *.py instead of *.pyc if python source available
(e.g. C:\bzr.dev\bzrlib\plugins\multiparent.py)
modified:
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
Diff too large for email (1149 lines, the limit is 1000).
More information about the bazaar-commits
mailing list