Rev 2715: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository
Robert Collins
robertc at robertcollins.net
Mon Aug 13 05:52:23 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 2715
revision-id: robertc at robertcollins.net-20070813045212-hzoaikwhwp4ojy29
parent: robertc at robertcollins.net-20070813044541-3dpihmjrfjlewqtw
parent: pqm at pqm.ubuntu.com-20070810230629-bcp0rgmbhp0z35e1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2007-08-13 14:52:12 +1000
message:
Merge bzr.dev.
added:
tools/win32/survey.txt survey.txt-20070809075950-sf265mgu9oog8jjb-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.24
revision-id: pqm at pqm.ubuntu.com-20070810230629-bcp0rgmbhp0z35e1
parent: pqm at pqm.ubuntu.com-20070810111627-h6m8b0ist3ca15ae
parent: aaron.bentley at utoronto.ca-20070810221918-sqvm0p7nvww4q1tj
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-08-11 00:06:29 +0100
message:
Restore compatibility with 0.19 version of merge directive 2
modified:
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.23.1.3
revision-id: aaron.bentley at utoronto.ca-20070810221918-sqvm0p7nvww4q1tj
parent: abentley at panoramicfeedback.com-20070810203616-ddqcdj4bzxh7db7r
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Fri 2007-08-10 18:19:18 -0400
message:
Fix whitespace
modified:
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.23.1.2
revision-id: abentley at panoramicfeedback.com-20070810203616-ddqcdj4bzxh7db7r
parent: abentley at panoramicfeedback.com-20070810203007-1kmxe2pg87w4p798
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: old-merge-directive
timestamp: Fri 2007-08-10 16:36:16 -0400
message:
Fix whitespace
modified:
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.23.1.1
revision-id: abentley at panoramicfeedback.com-20070810203007-1kmxe2pg87w4p798
parent: pqm at pqm.ubuntu.com-20070810111627-h6m8b0ist3ca15ae
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: old-merge-directive
timestamp: Fri 2007-08-10 16:30:07 -0400
message:
Restore support for Merge directive 2 / 0.19
modified:
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.23
revision-id: pqm at pqm.ubuntu.com-20070810111627-h6m8b0ist3ca15ae
parent: pqm at pqm.ubuntu.com-20070810071232-0ndzwbob5juuzaus
parent: bialix at ukr.net-20070810100053-1caublwh3bnvvdmg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-08-10 12:16:27 +0100
message:
Windows standalone installer show link to registration survey when
installation finished (bialix,r=ian)
added:
tools/win32/survey.txt survey.txt-20070809075950-sf265mgu9oog8jjb-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.14.2.4
revision-id: bialix at ukr.net-20070810100053-1caublwh3bnvvdmg
parent: bialix at ukr.net-20070810092154-afdm2csq71e2kw12
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer
timestamp: Fri 2007-08-10 13:00:53 +0300
message:
NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.14.2.3
revision-id: bialix at ukr.net-20070810092154-afdm2csq71e2kw12
parent: bialix at ukr.net-20070810090438-0835xdz0rl8825qv
parent: pqm at pqm.ubuntu.com-20070810071232-0ndzwbob5juuzaus
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer
timestamp: Fri 2007-08-10 12:21:54 +0300
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
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_is_ignored.py test_is_ignored.py-20060518083307-a5b383dd4d070083
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.14.2.2
revision-id: bialix at ukr.net-20070810090438-0835xdz0rl8825qv
parent: bialix at ukr.net-20070809080432-ph8klgs745kwa5bw
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer
timestamp: Fri 2007-08-10 12:04:38 +0300
message:
fixes after Ian's review
modified:
tools/win32/survey.txt survey.txt-20070809075950-sf265mgu9oog8jjb-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.14.2.1
revision-id: bialix at ukr.net-20070809080432-ph8klgs745kwa5bw
parent: pqm at pqm.ubuntu.com-20070808113110-acathx9d9mpfo80z
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer
timestamp: Thu 2007-08-09 11:04:32 +0300
message:
windows standalone installer: show link to survey when installation finished
added:
tools/win32/survey.txt survey.txt-20070809075950-sf265mgu9oog8jjb-1
modified:
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.22
revision-id: pqm at pqm.ubuntu.com-20070810071232-0ndzwbob5juuzaus
parent: pqm at pqm.ubuntu.com-20070810055236-5viugoz9x2besqh3
parent: mbp at sourcefrog.net-20070809033931-s6dr6q38rs82ni5i
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-08-10 08:12:32 +0100
message:
(mbp) rename 0.19 release to 0.90
modified:
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.16.2.2
revision-id: mbp at sourcefrog.net-20070809033931-s6dr6q38rs82ni5i
parent: mbp at sourcefrog.net-20070809032304-r2nzqvfgqt36jkko
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: rename-0.19
timestamp: Thu 2007-08-09 13:39:31 +1000
message:
Fix up other references to 0.19
modified:
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.16.2.1
revision-id: mbp at sourcefrog.net-20070809032304-r2nzqvfgqt36jkko
parent: pqm at pqm.ubuntu.com-20070809000503-7gad4qd85xll5ucf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: rename-0.19
timestamp: Thu 2007-08-09 13:23:04 +1000
message:
Rename upcoming release from 0.19 to 0.90
modified:
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.21
revision-id: pqm at pqm.ubuntu.com-20070810055236-5viugoz9x2besqh3
parent: pqm at pqm.ubuntu.com-20070810032951-lfyztl72xe81b2uo
parent: andrew.bennetts at canonical.com-20070809011436-gdrflmle4tsc00kl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-08-10 06:52:36 +0100
message:
(Andrew Bennetts) Fix bzrlib.opentracefile('foo').
modified:
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.13.1.1
revision-id: andrew.bennetts at canonical.com-20070809011436-gdrflmle4tsc00kl
parent: pqm at pqm.ubuntu.com-20070808055516-ml9ucjsb4idmpmww
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: tracefilename-fix
timestamp: Thu 2007-08-09 11:14:36 +1000
message:
Fix bzrlib.opentracefile('foo').
modified:
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.20
revision-id: pqm at pqm.ubuntu.com-20070810032951-lfyztl72xe81b2uo
parent: pqm at pqm.ubuntu.com-20070809151906-hdn9oyslf2qib2op
parent: ian.clatworthy at internode.on.net-20070810025003-y86mbn22qe3qkg5g
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-08-10 04:29:51 +0100
message:
(Ian Clatworthy) Registration survey added to README
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.19.1.1
revision-id: ian.clatworthy at internode.on.net-20070810025003-y86mbn22qe3qkg5g
parent: pqm at pqm.ubuntu.com-20070809151906-hdn9oyslf2qib2op
parent: ian.clatworthy at internode.on.net-20070809053039-hb8izpk0swp1syzr
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Fri 2007-08-10 12:50:03 +1000
message:
(Ian Clatworthy) Registration survey added to README
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.17.1.1
revision-id: ian.clatworthy at internode.on.net-20070809053039-hb8izpk0swp1syzr
parent: pqm at pqm.ubuntu.com-20070809033454-r4dk8909z5zxspum
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.registration
timestamp: Thu 2007-08-09 15:30:39 +1000
message:
Added link to registration survey to README
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.19
revision-id: pqm at pqm.ubuntu.com-20070809151906-hdn9oyslf2qib2op
parent: pqm at pqm.ubuntu.com-20070809063601-esywbsbqp7zcs4x9
parent: abentley at panoramicfeedback.com-20070809143455-3tkkwfjba2de78cu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-08-09 16:19:06 +0100
message:
Allow omitting -o for bundle, add --format
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.10.1.7
revision-id: abentley at panoramicfeedback.com-20070809143455-3tkkwfjba2de78cu
parent: aaron.bentley at utoronto.ca-20070809052924-ajaufw1758hs8n0n
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: send-bundle
timestamp: Thu 2007-08-09 10:34:55 -0400
message:
Fix option grammar
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.10.1.6
revision-id: aaron.bentley at utoronto.ca-20070809052924-ajaufw1758hs8n0n
parent: aaron.bentley at utoronto.ca-20070809051653-cal7k9ih3e37f7ip
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: send-bundle
timestamp: Thu 2007-08-09 01:29:24 -0400
message:
Update help to describe available formats
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.10.1.5
revision-id: aaron.bentley at utoronto.ca-20070809051653-cal7k9ih3e37f7ip
parent: aaron.bentley at utoronto.ca-20070809050103-flwt9g996msssq9u
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: send-bundle
timestamp: Thu 2007-08-09 01:16:53 -0400
message:
Display correct help message in from_kwargs
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.10.1.4
revision-id: aaron.bentley at utoronto.ca-20070809050103-flwt9g996msssq9u
parent: aaron.bentley at utoronto.ca-20070809045442-8himzbkqth0y5924
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: send-bundle
timestamp: Thu 2007-08-09 01:01:03 -0400
message:
Fix reference to told submit command
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.10.1.3
revision-id: aaron.bentley at utoronto.ca-20070809045442-8himzbkqth0y5924
parent: aaron.bentley at utoronto.ca-20070808063055-bh56b51f3vai83n6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: send-bundle
timestamp: Thu 2007-08-09 00:54:42 -0400
message:
Ensure that a format 0.9 bundle is generated
modified:
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.10.1.2
revision-id: aaron.bentley at utoronto.ca-20070808063055-bh56b51f3vai83n6
parent: aaron.bentley at utoronto.ca-20070808044010-7swp1274oszh7pbe
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: send-bundle
timestamp: Wed 2007-08-08 02:30:55 -0400
message:
Add support for selecting bundle format
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.10.1.1
revision-id: aaron.bentley at utoronto.ca-20070808044010-7swp1274oszh7pbe
parent: pqm at pqm.ubuntu.com-20070807225230-7gb6fot3mnsxp7zs
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: send-bundle
timestamp: Wed 2007-08-08 00:40:10 -0400
message:
Split 'send' into 'send' and 'bundle'.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.18
revision-id: pqm at pqm.ubuntu.com-20070809063601-esywbsbqp7zcs4x9
parent: pqm at pqm.ubuntu.com-20070809033454-r4dk8909z5zxspum
parent: mbp at sourcefrog.net-20070809055620-2tvrnr8v15h02fqh
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-08-09 07:36:01 +0100
message:
Add selftest --strict
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.16.1.1
revision-id: mbp at sourcefrog.net-20070809055620-2tvrnr8v15h02fqh
parent: pqm at pqm.ubuntu.com-20070809000503-7gad4qd85xll5ucf
parent: d.m.watkins at warwick.ac.uk-20070731104202-vxpb2l2ew11s35rc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Thu 2007-08-09 15:56:20 +1000
message:
Add selftest --strict
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.3.6
revision-id: d.m.watkins at warwick.ac.uk-20070731104202-vxpb2l2ew11s35rc
parent: d.m.watkins at warwick.ac.uk-20070731103853-g8rsi4sggul6tx8h
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 111914
timestamp: Tue 2007-07-31 11:42:02 +0100
message:
bzr selftest --strict'' fails if there are any missing features or expected test failures, as per bug #111914.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.3.5
revision-id: d.m.watkins at warwick.ac.uk-20070731103853-g8rsi4sggul6tx8h
parent: d.m.watkins at warwick.ac.uk-20070731103451-rq3i7wrpxwk0a6tl
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 111914
timestamp: Tue 2007-07-31 11:38:53 +0100
message:
Added note regarding --strict to HACKING.
modified:
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.3.4
revision-id: d.m.watkins at warwick.ac.uk-20070731103451-rq3i7wrpxwk0a6tl
parent: d.m.watkins at warwick.ac.uk-20070731103402-m3r94l098em3f2je
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 111914
timestamp: Tue 2007-07-31 11:34:51 +0100
message:
'bzr selftest --strict' now fails if there are any unsupported features or tests that are known to fail.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.3.3
revision-id: d.m.watkins at warwick.ac.uk-20070731103402-m3r94l098em3f2je
parent: d.m.watkins at warwick.ac.uk-20070731103333-sdelcaazn0fxgaf3
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 111914
timestamp: Tue 2007-07-31 11:34:02 +0100
message:
Added UI support for bzr selftest --strict.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.3.2
revision-id: d.m.watkins at warwick.ac.uk-20070731103333-sdelcaazn0fxgaf3
parent: d.m.watkins at warwick.ac.uk-20070731103259-spt2tajag1mtuzli
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 111914
timestamp: Tue 2007-07-31 11:33:33 +0100
message:
Added tests for ExtendedTestResult.wasStrictlySuccessful.
modified:
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.3.1
revision-id: d.m.watkins at warwick.ac.uk-20070731103259-spt2tajag1mtuzli
parent: pqm at pqm.ubuntu.com-20070728030946-tfjmxwe9y2eq1gzo
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 111914
timestamp: Tue 2007-07-31 11:32:59 +0100
message:
Added ExtendedTestResult.wasStrictlySuccessful.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.17
revision-id: pqm at pqm.ubuntu.com-20070809033454-r4dk8909z5zxspum
parent: pqm at pqm.ubuntu.com-20070809000503-7gad4qd85xll5ucf
parent: john at arbash-meinel.com-20070808143456-wa00r4p8r146p689
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-08-09 04:34:54 +0100
message:
(John Arbash Meinel) Add timing information to hpss logging
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.3.4.8
revision-id: john at arbash-meinel.com-20070808143456-wa00r4p8r146p689
parent: john at arbash-meinel.com-20070808141202-weal00qm5rwqqf1s
parent: pqm at pqm.ubuntu.com-20070808113110-acathx9d9mpfo80z
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hpss_debug_timing
timestamp: Wed 2007-08-08 09:34:56 -0500
message:
[merge] bzr.dev 2685
removed:
bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
added:
bzrlib/_dirstate_helpers_c.h _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
bzrlib/tests/repository_implementations/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
bzrlib/tests/repository_implementations/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
renamed:
doc/developers/HACKING => doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
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/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-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/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
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_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/default.css default.css-20060622101119-tgwtdci8z769bjb9-1
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.3.4.7
revision-id: john at arbash-meinel.com-20070808141202-weal00qm5rwqqf1s
parent: john at arbash-meinel.com-20070731213353-2ulbrrh3c8edyo80
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hpss_debug_timing
timestamp: Wed 2007-08-08 09:12:02 -0500
message:
Add NEWS and doc/developers/profiling.txt entries from Ian's feedback
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.3.4.6
revision-id: john at arbash-meinel.com-20070731213353-2ulbrrh3c8edyo80
parent: john at arbash-meinel.com-20070731212002-tq2bht51jbfedjlk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hpss_debug_timing
timestamp: Tue 2007-07-31 16:33:53 -0500
message:
Restore a line that shouldn't have been removed
modified:
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.3.4.5
revision-id: john at arbash-meinel.com-20070731212002-tq2bht51jbfedjlk
parent: john at arbash-meinel.com-20070731203847-2k1kby0spd95pcr2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hpss_debug_timing
timestamp: Tue 2007-07-31 16:20:02 -0500
message:
Stop tracking medium bytes if we aren't going to use it
modified:
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.3.4.4
revision-id: john at arbash-meinel.com-20070731203847-2k1kby0spd95pcr2
parent: john at arbash-meinel.com-20070731203101-p7h45wm6v4x6nb18
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hpss_debug_timing
timestamp: Tue 2007-07-31 15:38:47 -0500
message:
Switch around what bytes get logged.
Don't bother writing the header bytes, because you know what was
written by the tuple you see logged.
modified:
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.3.4.3
revision-id: john at arbash-meinel.com-20070731203101-p7h45wm6v4x6nb18
parent: john at arbash-meinel.com-20070731181501-dnfycgar5ld0dqa9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hpss_debug_timing
timestamp: Tue 2007-07-31 15:31:01 -0500
message:
Update to include a bit better formatting
And include logging of number of bytes transmitted.
modified:
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.3.4.2
revision-id: john at arbash-meinel.com-20070731181501-dnfycgar5ld0dqa9
parent: john at arbash-meinel.com-20070731180942-699o4e173i6h4878
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hpss_debug_timing
timestamp: Tue 2007-07-31 13:15:01 -0500
message:
Add debug timings for operations that have to send data
modified:
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.3.4.1
revision-id: john at arbash-meinel.com-20070731180942-699o4e173i6h4878
parent: pqm at pqm.ubuntu.com-20070731122244-f1jemfecukeevugw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hpss_debug_timing
timestamp: Tue 2007-07-31 13:09:42 -0500
message:
Add timing information for call/response groups for hpss
modified:
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.16
revision-id: pqm at pqm.ubuntu.com-20070809000503-7gad4qd85xll5ucf
parent: pqm at pqm.ubuntu.com-20070808195203-8j0f3kmhde2akrhx
parent: robertc at robertcollins.net-20070808025722-26wvnolkzmnse7s1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-08-09 01:05:03 +0100
message:
(robertc) Change the bzrlib.pack interface to accept tuples of bytestrings. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.11.1.1
revision-id: robertc at robertcollins.net-20070808025722-26wvnolkzmnse7s1
parent: pqm at pqm.ubuntu.com-20070808002810-703n3mr6b6hwataj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pack
timestamp: Wed 2007-08-08 12:57:22 +1000
message:
* The ``bzrlib.pack`` interface has changed to use tuples of bytestrings
rather than just bytestrings, making it easier to represent multiple
element names. As this interface was not used by any internal facilities
since it was introduced in 0.18 no API compatibility is being preserved.
The serialised form of these packs is identical with 0.18 when a single
element tuple is in use. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
Diff too large for email (1187 lines, the limit is 1000).
More information about the bazaar-commits
mailing list