Rev 2666: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository
Robert Collins
robertc at robertcollins.net
Wed Jul 18 07:07:45 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 2666
revision-id: robertc at robertcollins.net-20070718060739-2l2y7bjd1rf121fo
parent: robertc at robertcollins.net-20070718043129-ugp98g3fsuzh6sak
parent: pqm at pqm.ubuntu.com-20070717110203-zzmtp28nunhsoz12
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Wed 2007-07-18 16:07:39 +1000
message:
Merge bzr.dev.
added:
bzrlib/util/tests/ bzrlibutiltests-20070713054332-wmm62qs3xvyfzwup-1
bzrlib/util/tests/__init__.py __init__.py-20070713054446-oliu3oth0gy08y0t-1
bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
doc/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/developers/diff.txt diff.txt-20070716233605-2q6jzorua7mr42jk-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2592.1.25.2.7
revision-id: pqm at pqm.ubuntu.com-20070717110203-zzmtp28nunhsoz12
parent: pqm at pqm.ubuntu.com-20070717085355-1thg2x7z5muw1gju
parent: robertc at robertcollins.net-20070715154037-3ar8g89decddc9su
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-17 12:02:03 +0100
message:
(robertc) New indexing facilities for maintaining dedicated indices within bzr.
added:
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
doc/developers/indices.txt indices.txt-20070713142939-m5cdnp31u8ape0td-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 2592.1.25.2.6
revision-id: pqm at pqm.ubuntu.com-20070717085355-1thg2x7z5muw1gju
parent: pqm at pqm.ubuntu.com-20070717054918-530mjsb0mvyehe8h
parent: ian.clatworthy at internode.on.net-20070717025808-m33xg1tth619xxqy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-17 09:53:55 +0100
message:
(Ian Clatworthy) Merge 0.18 NEWS changes into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2592.1.25.2.4.2.1
revision-id: ian.clatworthy at internode.on.net-20070717025808-m33xg1tth619xxqy
parent: pqm at pqm.ubuntu.com-20070716205413-42lqws7bkld2gbju
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-07-17 12:58:08 +1000
message:
(Ian Clatworthy) Merge 0.18 NEWS changes into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2592.1.25.2.5
revision-id: pqm at pqm.ubuntu.com-20070717054918-530mjsb0mvyehe8h
parent: pqm at pqm.ubuntu.com-20070716205413-42lqws7bkld2gbju
parent: aaron.bentley at utoronto.ca-20070717002716-npegr2fup7cb1g5b
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-17 06:49:18 +0100
message:
Add performance analysis of diff
added:
doc/developers/diff.txt diff.txt-20070716233605-2q6jzorua7mr42jk-1
modified:
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
------------------------------------------------------------
revno: 2592.1.25.2.4.1.1
revision-id: aaron.bentley at utoronto.ca-20070717002716-npegr2fup7cb1g5b
parent: pqm at pqm.ubuntu.com-20070716205413-42lqws7bkld2gbju
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.docs
timestamp: Mon 2007-07-16 20:27:16 -0400
message:
Add performance analysis of diff
added:
doc/developers/diff.txt diff.txt-20070716233605-2q6jzorua7mr42jk-1
modified:
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
------------------------------------------------------------
revno: 2592.1.25.2.4
revision-id: pqm at pqm.ubuntu.com-20070716205413-42lqws7bkld2gbju
parent: pqm at pqm.ubuntu.com-20070716202122-hs4anrki1xzulugo
parent: john at arbash-meinel.com-20070716195536-7swyum1epmk0313d
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-16 21:54:13 +0100
message:
(James Westby) documentation updates (plugins, configuration, etc)
added:
doc/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
modified:
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
------------------------------------------------------------
revno: 2592.1.25.2.2.1.1
revision-id: john at arbash-meinel.com-20070716195536-7swyum1epmk0313d
parent: pqm at pqm.ubuntu.com-20070716084122-jfjzwtbimsjv0iqv
parent: jw+debian at jameswestby.net-20070713224426-n74sjf5wwvpm1n0n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-07-16 14:55:36 -0500
message:
(James Westby) documentation updates (plugins, configuration, etc)
added:
doc/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
modified:
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
------------------------------------------------------------
revno: 2592.1.9.1.3
revision-id: jw+debian at jameswestby.net-20070713224426-n74sjf5wwvpm1n0n
parent: jw+debian at jameswestby.net-20070713223936-nyumc0ogoses82cf
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.docs
timestamp: Fri 2007-07-13 23:44:26 +0100
message:
Put plugin installation instructions before how to write them.
Also add a note that plugin installation directories must have names
that are valid python identifiers.
modified:
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
------------------------------------------------------------
revno: 2592.1.9.1.2
revision-id: jw+debian at jameswestby.net-20070713223936-nyumc0ogoses82cf
parent: jw+debian at jameswestby.net-20070713223507-lpvkrwy79opb29oo
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.docs
timestamp: Fri 2007-07-13 23:39:36 +0100
message:
Add a reference to the main smart server documentation.
modified:
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
------------------------------------------------------------
revno: 2592.1.9.1.1
revision-id: jw+debian at jameswestby.net-20070713223507-lpvkrwy79opb29oo
parent: pqm at pqm.ubuntu.com-20070711162842-8fx9cc0c3ogyxudl
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.docs
timestamp: Fri 2007-07-13 23:35:07 +0100
message:
Split out bug tracker configuration in to its own file.
Make a few small changes in configuration.txt as well.
Maybe configuration.txt should have a link to the bug_trackers.txt
file.
added:
doc/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
modified:
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
------------------------------------------------------------
revno: 2592.1.25.2.3
revision-id: pqm at pqm.ubuntu.com-20070716202122-hs4anrki1xzulugo
parent: pqm at pqm.ubuntu.com-20070716084122-jfjzwtbimsjv0iqv
parent: john at arbash-meinel.com-20070716181437-rrixgvv2usln0vkk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-16 21:21:22 +0100
message:
(John Arbash Meinel) Skip pyrex dependencies if we can't build, rather than failing
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2592.1.25.3.4
revision-id: john at arbash-meinel.com-20070716181437-rrixgvv2usln0vkk
parent: john at arbash-meinel.com-20070715144053-09hrns6fxp9ssyj6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: skip_pyrex
timestamp: Mon 2007-07-16 13:14:37 -0500
message:
Simple NEWS entry about changes
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2592.1.25.3.3
revision-id: john at arbash-meinel.com-20070715144053-09hrns6fxp9ssyj6
parent: john at arbash-meinel.com-20070715143330-6ddg2ay25b4pxiu1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: skip_pyrex
timestamp: Sun 2007-07-15 09:40:53 -0500
message:
Add another blank line to make it show up better
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2592.1.25.3.2
revision-id: john at arbash-meinel.com-20070715143330-6ddg2ay25b4pxiu1
parent: john at arbash-meinel.com-20070715142444-c90zfgn3khpl1swt
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: skip_pyrex
timestamp: Sun 2007-07-15 09:33:30 -0500
message:
Try another form of comment
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2592.1.25.3.1
revision-id: john at arbash-meinel.com-20070715142444-c90zfgn3khpl1swt
parent: pqm at pqm.ubuntu.com-20070713074627-93zxs9uh528y0fki
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: skip_pyrex
timestamp: Sun 2007-07-15 09:24:44 -0500
message:
Update setup.py to just skip extensions that are not available.
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2592.1.25.2.2
revision-id: pqm at pqm.ubuntu.com-20070716084122-jfjzwtbimsjv0iqv
parent: pqm at pqm.ubuntu.com-20070715233134-zrptwn7og449cirw
parent: mbp at sourcefrog.net-20070713044155-3pifeyzn631q3tun
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-16 09:41:22 +0100
message:
Revert tightening of options api - breaks too many plugins
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
------------------------------------------------------------
revno: 2592.1.6.1.14
revision-id: mbp at sourcefrog.net-20070713044155-3pifeyzn631q3tun
parent: mbp at sourcefrog.net-20070713020421-1gwu8tzp7u9xd7kf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: check-options
timestamp: Fri 2007-07-13 14:41:55 +1000
message:
Revert tightening of options api - breaks too many plugins
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
------------------------------------------------------------
revno: 2592.1.25.2.1
revision-id: pqm at pqm.ubuntu.com-20070715233134-zrptwn7og449cirw
parent: pqm at pqm.ubuntu.com-20070713074627-93zxs9uh528y0fki
parent: mbp at sourcefrog.net-20070713062010-c4u4b751qzb7v8ue
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-16 00:31:34 +0100
message:
Move bencode tests into util.tests
added:
bzrlib/util/tests/ bzrlibutiltests-20070713054332-wmm62qs3xvyfzwup-1
bzrlib/util/tests/__init__.py __init__.py-20070713054446-oliu3oth0gy08y0t-1
bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
------------------------------------------------------------
revno: 2592.1.21.1.2
revision-id: mbp at sourcefrog.net-20070713062010-c4u4b751qzb7v8ue
parent: mbp at sourcefrog.net-20070713042217-mnkwb9przs8x2de0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bencode
timestamp: Fri 2007-07-13 16:20:10 +1000
message:
Move bencode tests into util.tests
added:
bzrlib/util/tests/ bzrlibutiltests-20070713054332-wmm62qs3xvyfzwup-1
bzrlib/util/tests/__init__.py __init__.py-20070713054446-oliu3oth0gy08y0t-1
renamed:
bzrlib/tests/test_bencode.py => bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
------------------------------------------------------------
revno: 2592.1.21.1.1
revision-id: mbp at sourcefrog.net-20070713042217-mnkwb9przs8x2de0
parent: pqm at pqm.ubuntu.com-20070713031727-kcz297vvphee2hhg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bencode
timestamp: Fri 2007-07-13 14:22:17 +1000
message:
Move bencode tests from within their module into our test suite
added:
bzrlib/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
Diff too large for email (1122 lines, the limit is 1000).
More information about the bazaar-commits
mailing list