Rev 3111: Merge 1.0final back to trunk and bump to 1.1dev in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Dec 14 08:47:26 GMT 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3111
revision-id:pqm at pqm.ubuntu.com-20071214084717-xu119wq2x8l2w8lj
parent: pqm at pqm.ubuntu.com-20071214075036-o6tv5n85w95m57uq
parent: mbp at sourcefrog.net-20071214073549-wpekccrsxjv77yze
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-12-14 08:47:17 +0000
message:
Merge 1.0final back to trunk and bump to 1.1dev
added:
index.txt index.txt-20071121073725-0corxykv5irjal00-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 3053.2.1.1.10
revision-id:mbp at sourcefrog.net-20071214073549-wpekccrsxjv77yze
parent: mbp at sourcefrog.net-20071214043241-1o0tp12wa4c3lwm1
parent: pqm at pqm.ubuntu.com-20071214054408-5xnavnb30uddiqxh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integrate-1.0
timestamp: Fri 2007-12-14 18:35:49 +1100
message:
Merge 1.0final back to trunk and bump to 1.1dev
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/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3053.2.1.1.9
revision-id:mbp at sourcefrog.net-20071214043241-1o0tp12wa4c3lwm1
parent: mbp at sourcefrog.net-20071214031939-k8eidgwquq0tpdqd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.0final
timestamp: Fri 2007-12-14 15:32:41 +1100
message:
Prepare 1.0final!
modified:
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3053.2.1.1.8
revision-id:mbp at sourcefrog.net-20071214031939-k8eidgwquq0tpdqd
parent: mbp at sourcefrog.net-20071214010303-45drdvacyrkcfgii
parent: pqm at pqm.ubuntu.com-20071213230518-52jxe0qt1jl3flun
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.0final
timestamp: Fri 2007-12-14 14:19:39 +1100
message:
merge doc fixes
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
------------------------------------------------------------
revno: 3053.2.1.1.6.1.1
revision-id:pqm at pqm.ubuntu.com-20071213230518-52jxe0qt1jl3flun
parent: pqm at pqm.ubuntu.com-20071213150440-meahiun26u45m6xg
parent: ian.clatworthy at internode.on.net-20071213220827-fzgdx6wxq4vungq2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.0
timestamp: Thu 2007-12-13 23:05:18 +0000
message:
Doc tweaks from David Roberts and Aaron Bentley for 1.0 (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
------------------------------------------------------------
revno: 3053.2.1.1.6.2.1
revision-id:ian.clatworthy at internode.on.net-20071213220827-fzgdx6wxq4vungq2
parent: pqm at pqm.ubuntu.com-20071213150440-meahiun26u45m6xg
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: integ.1.0
timestamp: Fri 2007-12-14 08:08:27 +1000
message:
Doc tweaks from David Roberts and Aaron Bentley for 1.0 (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
------------------------------------------------------------
revno: 3053.2.1.1.7
revision-id:mbp at sourcefrog.net-20071214010303-45drdvacyrkcfgii
parent: pqm at pqm.ubuntu.com-20071213150440-meahiun26u45m6xg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.0final
timestamp: Fri 2007-12-14 12:03:03 +1100
message:
Cherrypick correction to download link
modified:
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
------------------------------------------------------------
revno: 3053.2.1.1.6
revision-id:pqm at pqm.ubuntu.com-20071213150440-meahiun26u45m6xg
parent: pqm at pqm.ubuntu.com-20071213131331-vedyv6qjpq64e6ey
parent: ian.clatworthy at internode.on.net-20071213133336-jp1k56brj06zo92q
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.0
timestamp: Thu 2007-12-13 15:04:40 +0000
message:
Improve bug tracker integration documentation (Ian Clatworthy)
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
------------------------------------------------------------
revno: 3053.2.1.1.5.1.1
revision-id:ian.clatworthy at internode.on.net-20071213133336-jp1k56brj06zo92q
parent: pqm at pqm.ubuntu.com-20071213131331-vedyv6qjpq64e6ey
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: integ.1.0
timestamp: Thu 2007-12-13 23:33:36 +1000
message:
Improve bug tracker integration documentation (Ian Clatworthy)
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
------------------------------------------------------------
revno: 3053.2.1.1.5
revision-id:pqm at pqm.ubuntu.com-20071213131331-vedyv6qjpq64e6ey
parent: pqm at pqm.ubuntu.com-20071213093911-fvma1c524c5dqmh0
parent: ian.clatworthy at internode.on.net-20071213121653-7kjfdwve36wctvj1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.0
timestamp: Thu 2007-12-13 13:13:31 +0000
message:
cherrypicking/rebasing section for User Guide (Ian Clatworthy)
added:
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
modified:
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
------------------------------------------------------------
revno: 3053.2.1.1.4.1.1
revision-id:ian.clatworthy at internode.on.net-20071213121653-7kjfdwve36wctvj1
parent: pqm at pqm.ubuntu.com-20071213093911-fvma1c524c5dqmh0
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: integ.1.0
timestamp: Thu 2007-12-13 22:16:53 +1000
message:
cherrypicking/rebasing section for User Guide (Ian Clatworthy)
added:
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
modified:
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
------------------------------------------------------------
revno: 3053.2.1.1.4
revision-id:pqm at pqm.ubuntu.com-20071213093911-fvma1c524c5dqmh0
parent: pqm at pqm.ubuntu.com-20071211100144-jo6esm2uv8e6o6l1
parent: ian.clatworthy at internode.on.net-20071213081507-iw45tmwousul08mj
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.0
timestamp: Thu 2007-12-13 09:39:11 +0000
message:
Clean-up of User Guide for 1.0 (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/en/user-guide/authentication_conf.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
doc/en/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
------------------------------------------------------------
revno: 3053.2.1.1.3.1.1
revision-id:ian.clatworthy at internode.on.net-20071213081507-iw45tmwousul08mj
parent: pqm at pqm.ubuntu.com-20071211100144-jo6esm2uv8e6o6l1
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: integ.1.0
timestamp: Thu 2007-12-13 18:15:07 +1000
message:
Clean-up of User Guide for 1.0 (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/en/user-guide/authentication_conf.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
doc/en/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
------------------------------------------------------------
revno: 3053.2.1.1.3
revision-id:pqm at pqm.ubuntu.com-20071211100144-jo6esm2uv8e6o6l1
parent: pqm at pqm.ubuntu.com-20071210062932-02pcwcivpc0t4rw3
parent: mbp at sourcefrog.net-20071211082049-iv36d21rresrbvcv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.0
timestamp: Tue 2007-12-11 10:01:44 +0000
message:
Prepare 1.0rc3
removed:
doc/en/user-reference/index.txt index.txt-20070830033353-ud9e03xsh24053oo-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 3053.2.1.1.2.1.5
revision-id:mbp at sourcefrog.net-20071211082049-iv36d21rresrbvcv
parent: mbp at sourcefrog.net-20071211081455-i2q2d9t41ushikj1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.0rc3
timestamp: Tue 2007-12-11 19:20:49 +1100
message:
Prepare 1.0rc3 and update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3053.2.1.1.2.1.4
revision-id:mbp at sourcefrog.net-20071211081455-i2q2d9t41ushikj1
parent: mbp at sourcefrog.net-20071211081211-rzujbpkr1pjnfx0o
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.0rc3
timestamp: Tue 2007-12-11 19:14:55 +1100
message:
Refile things into 1.0rc3 in NEWS that belong there
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3053.2.1.1.2.1.3
revision-id:mbp at sourcefrog.net-20071211081211-rzujbpkr1pjnfx0o
parent: mbp at sourcefrog.net-20071211075428-gzpa7bu2n3ps4mi9
parent: pqm at pqm.ubuntu.com-20071210120611-a3j02d26cbzvlyju
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.0rc3
timestamp: Tue 2007-12-11 19:12:11 +1100
message:
merge request to send errors to launchpad, http download feedback, #147836, #157026
removed:
doc/en/user-reference/index.txt index.txt-20070830033353-ud9e03xsh24053oo-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
------------------------------------------------------------
revno: 3053.2.1.1.2.1.2
revision-id:mbp at sourcefrog.net-20071211075428-gzpa7bu2n3ps4mi9
parent: mbp at sourcefrog.net-20071211075207-x7zl0u6cso2fz230
parent: mbp at sourcefrog.net-20071207065413-l9lnnl6q0tnx8qga
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.0rc3
timestamp: Tue 2007-12-11 18:54:28 +1100
message:
Workaround for docutils not accepting dot in option names
modified:
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 3092.4.1
revision-id:mbp at sourcefrog.net-20071207065413-l9lnnl6q0tnx8qga
parent: pqm at pqm.ubuntu.com-20071207051359-iyupti9xt33jccin
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Fri 2007-12-07 17:54:13 +1100
message:
Make our version of rst2html monkey-patch around docutils not accepting . in an option name
modified:
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 3053.2.1.1.2.1.1
revision-id:mbp at sourcefrog.net-20071211075207-x7zl0u6cso2fz230
parent: pqm at pqm.ubuntu.com-20071210062932-02pcwcivpc0t4rw3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.0rc3
timestamp: Tue 2007-12-11 18:52:07 +1100
message:
Cherrypick addition Makefile dependency for user guide index
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
------------------------------------------------------------
revno: 3053.2.1.1.2
revision-id:pqm at pqm.ubuntu.com-20071210062932-02pcwcivpc0t4rw3
parent: pqm at pqm.ubuntu.com-20071130092321-y2du2bnecrwr3teg
parent: mbp at sourcefrog.net-20071210050331-1ilk655wvw6dpp31
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.0
timestamp: Mon 2007-12-10 06:29:32 +0000
message:
Prepare 1.0rc2
added:
doc/en/quick-reference/quick-start-summary.pdf quickstartsummary.pd-20071207005239-it6xmdjml8nxvzgt-1
doc/en/quick-reference/quick-start-summary.png quickstartsummary.pn-20071203142852-hsiybkmh37q5owwe-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/switch.py switch.py-20071116011000-v5lnw7d2wkng9eux-1
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
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_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
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_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_switch.py test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
doc/en/quick-reference/quick-start-summary.svg quickstartsummary.sv-20070813143223-5i7bgw7w8s7l3ae2-3
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/merging_changes.txt merging_changes.txt-20071122141511-0knao2lklsdsvb1q-3
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/working_offline_central.txt working_offline_cent-20071123055134-k5x4ekduci2lbn36-5
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
------------------------------------------------------------
revno: 3093.1.3
revision-id:mbp at sourcefrog.net-20071210050331-1ilk655wvw6dpp31
parent: mbp at sourcefrog.net-20071210033528-ipbsduraw72721gc
parent: pqm at pqm.ubuntu.com-20071130092321-y2du2bnecrwr3teg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.0rc2
timestamp: Mon 2007-12-10 16:03:31 +1100
message:
Merge from bzr.1.0 branch
added:
index.txt index.txt-20071121073725-0corxykv5irjal00-1
modified:
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
------------------------------------------------------------
revno: 3093.1.2
revision-id:mbp at sourcefrog.net-20071210033528-ipbsduraw72721gc
parent: mbp at sourcefrog.net-20071207072847-77mhfcpbfhj9hvz4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.0rc2
timestamp: Mon 2007-12-10 14:35:28 +1100
message:
Correct bzr script and bzrlib version numbers
modified:
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3093.1.1
revision-id:mbp at sourcefrog.net-20071207072847-77mhfcpbfhj9hvz4
parent: pqm at pqm.ubuntu.com-20071207064646-1nif1u2vsep2vqud
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr-1.0rc2
timestamp: Fri 2007-12-07 18:28:47 +1100
message:
Prepare 1.0rc2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3053.2.1.1.1
revision-id:pqm at pqm.ubuntu.com-20071130092321-y2du2bnecrwr3teg
parent: pqm at pqm.ubuntu.com-20071130062859-ak4qs7qjow25kg0i
parent: mbp at sourcefrog.net-20071130082836-dc2fmdnf0naerume
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.0
timestamp: Fri 2007-11-30 09:23:21 +0000
message:
Integrated changes for 1.0
added:
doc/en/tutorials/ docentutorials-20071127235845-bm2lu60bvau1ptmh-1
doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/best_practice_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/central_intro.txt central_intro.txt-20071123055134-k5x4ekduci2lbn36-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/distributed_intro.txt distributed_intro.tx-20071123154453-dk2mjhrg1vpjm5w2-2
doc/en/user-guide/entering_commands.txt using_bazaar.txt-20071114035000-q36a9h57ps06uvnl-6
doc/en/user-guide/getting_help.txt getting_help.txt-20071128000722-ncxiua259xwbdbg7-2
doc/en/user-guide/images/ images-20071114035000-q36a9h57ps06uvnl-3
doc/en/user-guide/images/workflows_centralized.png workflows_centralize-20071114035000-q36a9h57ps06uvnl-8
doc/en/user-guide/images/workflows_centralized.svg workflows_centralize-20071130043324-bhms0cgyphhq1b2x-1
doc/en/user-guide/images/workflows_gatekeeper.png workflows_gatekeeper-20071114035000-q36a9h57ps06uvnl-9
doc/en/user-guide/images/workflows_gatekeeper.svg workflows_gatekeeper-20071130043324-bhms0cgyphhq1b2x-2
doc/en/user-guide/images/workflows_localcommit.png workflows_localcommi-20071114035000-q36a9h57ps06uvnl-10
doc/en/user-guide/images/workflows_localcommit.svg workflows_localcommi-20071130043324-bhms0cgyphhq1b2x-3
doc/en/user-guide/images/workflows_peer.png workflows_peer.png-20071114035000-q36a9h57ps06uvnl-11
doc/en/user-guide/images/workflows_peer.svg workflows_peer.svg-20071130043324-bhms0cgyphhq1b2x-4
doc/en/user-guide/images/workflows_pqm.png workflows_pqm.png-20071114035000-q36a9h57ps06uvnl-12
doc/en/user-guide/images/workflows_pqm.svg workflows_pqm.svg-20071130043324-bhms0cgyphhq1b2x-5
doc/en/user-guide/images/workflows_shared.png workflows_shared.png-20071114035000-q36a9h57ps06uvnl-13
doc/en/user-guide/images/workflows_shared.svg workflows_shared.svg-20071130043324-bhms0cgyphhq1b2x-6
doc/en/user-guide/images/workflows_single.png workflows_single.png-20071114035000-q36a9h57ps06uvnl-14
doc/en/user-guide/images/workflows_single.svg workflows_single.svg-20071130043324-bhms0cgyphhq1b2x-7
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/merging_changes.txt merging_changes.txt-20071122141511-0knao2lklsdsvb1q-3
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
doc/en/user-guide/recording_changes.txt recording_changes.tx-20071121073725-0corxykv5irjal00-4
doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
doc/en/user-guide/reviewing_changes.txt reviewing_changes.tx-20071121073725-0corxykv5irjal00-6
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
doc/en/user-guide/solo_intro.txt solo_workflow.txt-20071121073725-0corxykv5irjal00-7
doc/en/user-guide/starting_a_project.txt starting_a_project.t-20071121073725-0corxykv5irjal00-8
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_checkouts.txt using_checkouts.txt-20071123055134-k5x4ekduci2lbn36-4
doc/en/user-guide/using_gatekeepers.txt using_gatekeepers.tx-20071123154453-dk2mjhrg1vpjm5w2-5
doc/en/user-guide/working_offline_central.txt working_offline_cent-20071123055134-k5x4ekduci2lbn36-5
doc/en/user-guide/writing_a_plugin.txt writing_a_plugin.txt-20071114035000-q36a9h57ps06uvnl-7
index.txt index.txt-20071121073725-0corxykv5irjal00-1
renamed:
doc/en/user-guide/centralized_workflow.txt => doc/en/tutorials/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/en/user-guide/tutorial.txt => doc/en/tutorials/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
doc/en/user-guide/authentication_conf.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/en/user-guide/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
doc/en/tutorials/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
------------------------------------------------------------
revno: 3053.2.1.2.3
revision-id:mbp at sourcefrog.net-20071130082836-dc2fmdnf0naerume
parent: mbp at sourcefrog.net-20071130082648-4e52zbnptjtgoyu2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integrate-1.0
timestamp: Fri 2007-11-30 19:28:36 +1100
message:
Prepare 1.0rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3053.2.1.2.2
revision-id:mbp at sourcefrog.net-20071130082648-4e52zbnptjtgoyu2
parent: mbp at sourcefrog.net-20071130080938-cm4x7gnupia3do9g
parent: andrew.bennetts at canonical.com-20071130075646-6ego2oagvdkk4xtk
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integrate-1.0
timestamp: Fri 2007-11-30 19:26:48 +1100
message:
(merge) Support pulling from knits to packs
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
------------------------------------------------------------
revno: 3053.2.1.2.1
revision-id:mbp at sourcefrog.net-20071130080938-cm4x7gnupia3do9g
parent: pqm at pqm.ubuntu.com-20071130062859-ak4qs7qjow25kg0i
parent: pqm at pqm.ubuntu.com-20071130080302-lcnafsyhqzjq6fjb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integrate-1.0
timestamp: Fri 2007-11-30 19:09:38 +1100
message:
Merge trunk
added:
doc/en/tutorials/ docentutorials-20071127235845-bm2lu60bvau1ptmh-1
doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/best_practice_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/central_intro.txt central_intro.txt-20071123055134-k5x4ekduci2lbn36-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/distributed_intro.txt distributed_intro.tx-20071123154453-dk2mjhrg1vpjm5w2-2
doc/en/user-guide/entering_commands.txt using_bazaar.txt-20071114035000-q36a9h57ps06uvnl-6
doc/en/user-guide/getting_help.txt getting_help.txt-20071128000722-ncxiua259xwbdbg7-2
doc/en/user-guide/images/ images-20071114035000-q36a9h57ps06uvnl-3
doc/en/user-guide/images/workflows_centralized.png workflows_centralize-20071114035000-q36a9h57ps06uvnl-8
doc/en/user-guide/images/workflows_centralized.svg workflows_centralize-20071130043324-bhms0cgyphhq1b2x-1
doc/en/user-guide/images/workflows_gatekeeper.png workflows_gatekeeper-20071114035000-q36a9h57ps06uvnl-9
doc/en/user-guide/images/workflows_gatekeeper.svg workflows_gatekeeper-20071130043324-bhms0cgyphhq1b2x-2
doc/en/user-guide/images/workflows_localcommit.png workflows_localcommi-20071114035000-q36a9h57ps06uvnl-10
doc/en/user-guide/images/workflows_localcommit.svg workflows_localcommi-20071130043324-bhms0cgyphhq1b2x-3
doc/en/user-guide/images/workflows_peer.png workflows_peer.png-20071114035000-q36a9h57ps06uvnl-11
doc/en/user-guide/images/workflows_peer.svg workflows_peer.svg-20071130043324-bhms0cgyphhq1b2x-4
doc/en/user-guide/images/workflows_pqm.png workflows_pqm.png-20071114035000-q36a9h57ps06uvnl-12
doc/en/user-guide/images/workflows_pqm.svg workflows_pqm.svg-20071130043324-bhms0cgyphhq1b2x-5
doc/en/user-guide/images/workflows_shared.png workflows_shared.png-20071114035000-q36a9h57ps06uvnl-13
doc/en/user-guide/images/workflows_shared.svg workflows_shared.svg-20071130043324-bhms0cgyphhq1b2x-6
doc/en/user-guide/images/workflows_single.png workflows_single.png-20071114035000-q36a9h57ps06uvnl-14
doc/en/user-guide/images/workflows_single.svg workflows_single.svg-20071130043324-bhms0cgyphhq1b2x-7
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/merging_changes.txt merging_changes.txt-20071122141511-0knao2lklsdsvb1q-3
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
doc/en/user-guide/recording_changes.txt recording_changes.tx-20071121073725-0corxykv5irjal00-4
doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
doc/en/user-guide/reviewing_changes.txt reviewing_changes.tx-20071121073725-0corxykv5irjal00-6
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
doc/en/user-guide/solo_intro.txt solo_workflow.txt-20071121073725-0corxykv5irjal00-7
doc/en/user-guide/starting_a_project.txt starting_a_project.t-20071121073725-0corxykv5irjal00-8
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_checkouts.txt using_checkouts.txt-20071123055134-k5x4ekduci2lbn36-4
doc/en/user-guide/using_gatekeepers.txt using_gatekeepers.tx-20071123154453-dk2mjhrg1vpjm5w2-5
doc/en/user-guide/working_offline_central.txt working_offline_cent-20071123055134-k5x4ekduci2lbn36-5
doc/en/user-guide/writing_a_plugin.txt writing_a_plugin.txt-20071114035000-q36a9h57ps06uvnl-7
index.txt index.txt-20071121073725-0corxykv5irjal00-1
renamed:
doc/en/user-guide/centralized_workflow.txt => doc/en/tutorials/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/en/user-guide/tutorial.txt => doc/en/tutorials/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
doc/en/user-guide/authentication_conf.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/en/user-guide/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
doc/en/tutorials/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
=== added file 'index.txt'
=== modified file 'Makefile'
--- a/Makefile 2007-12-10 10:22:57 +0000
+++ b/Makefile 2007-12-13 13:33:36 +0000
@@ -116,6 +116,7 @@
bzrlib/conflicts.py \
bzrlib/help_topics.py \
bzrlib/sign_my_commits.py \
+ bzrlib/bugtracker.py \
generate_docs.py \
tools/doc_generate/__init__.py \
tools/doc_generate/autodoc_man.py \
=== modified file 'NEWS'
--- a/NEWS 2007-12-14 06:55:43 +0000
+++ b/NEWS 2007-12-14 08:47:17 +0000
@@ -17,6 +17,9 @@
at the start of the file, promoting linear reads for ``bzr log`` and the
like. This partially fixes #154129. (Robert Collins)
+ * Merge directives now fetch prerequisites from the target branch if
+ needed. (Aaron Bentley)
+
BUGFIXES:
* Fix Makefile rules for doc generation. (Ian Clatworthy, #175207)
@@ -39,7 +42,24 @@
TESTING:
-bzr 1.0rc2 2007-12-07
+bzr 1.0 2007-12-14
+==================
+
+ DOCUMENTATION:
+
+ * More improvements and fixes to the User Guide. (Ian Clatworthy)
+
+ * Add information on cherrypicking/rebasing to the User Guide.
+ (Ian Clatworthy)
+
+ * Improve bug tracker integration documentation. (Ian Clatworthy)
+
+ * Minor edits to ``Bazaar in five minutes`` from David Roberts and
+ to the rebasing section of the User Guide from Aaron Bentley.
+ (Ian Clatworthy)
+
+
+bzr 1.0rc3 2007-12-11
=====================
CHANGES:
@@ -49,6 +69,37 @@
by mail to the mailing list.
(Martin Pool)
+ BUGFIXES:
+
+ * Fix Makefile rules for doc generation. (Ian Clatworthy, #175207)
+
+ * Give more feedback during long http downloads by making readv deliver data
+ as it arrives for urllib, and issue more requests for pycurl. High latency
+ networks are better handled by urllib, the pycurl implementation give more
+ feedback but also incur more latency.
+ (Vincent Ladeuil, #173010)
+
+ * Implement _make_parents_provider on RemoteRepository, allowing generating
+ bundles against branches on a smart server. (Andrew Bennetts, #147836)
+
+ DOCUMENTATION:
+
+ * Improved user guide. (Ian Clatworthy)
+
+ * The single-page quick reference guide is now available as a PDF.
+ (Ian Clatworthy)
+
+ INTERNALS:
+
+ * readv urllib http implementation is now a real iterator above the
+ underlying socket and deliver data as soon as it arrives. 'get' still
+ wraps its output in a StringIO.
+ (Vincent Ladeuil)
+
+
+bzr 1.0rc2 2007-12-07
+=====================
+
IMPROVEMENTS:
* Added a --coverage option to selftest. (Andrew Bennetts)
@@ -56,9 +107,6 @@
* ``bzr commit`` now doesn't print the revision number twice. (Matt
Nordhoff, #172612)
- * Merge directives now fetch prerequisites from the target branch if
- needed. (Aaron Bentley)
-
* New configuration option ``bugtracker_<tracker_abbrevation>_url`` to
define locations of bug trackers that are not directly supported by
bzr or a plugin. The URL will be treated as a template and ``{id}``
@@ -86,11 +134,6 @@
INTERNALS:
- * readv urllib http implementation is now a real iterator above the
- underlying socket and deliver data as soon as it arrives. 'get' still
- wraps its output in a StringIO.
- (Vincent Ladeuil)
-
* New -Dhttp debug option reports http connections, requests and responses.
(Vincent Ladeuil)
@@ -113,25 +156,15 @@
* Check for missing basis texts when fetching from packs to packs.
(John Arbash Meinel, #165290)
- * Give more feedback during long http downloads by making readv deliver data
- as it arrives for urllib, and issue more requests for pycurl. High latency
- networks are better handled by urllib, the pycurl implementation give more
- feedback but also incur more latency.
- (Vincent Ladeuil, #173010)
-
* Fall back to showing e-mail in ``log --short/--line`` if the
committer/author has only e-mail. (Lukáš Lalinský, #157026)
- * Implement _make_parents_provider on RemoteRepository, allowing generating
- bundles against branches on a smart server. (Andrew Bennetts, #147836)
-
API BREAKS:
* Deprecate not passing a ``location`` argument to commit reporters'
``started`` methods. (Matt Nordhoff)
-
bzr 1.0rc1 2007-11-30
=====================
=== modified file 'bzr'
--- a/bzr 2007-11-02 08:45:10 +0000
+++ b/bzr 2007-12-14 07:35:49 +0000
@@ -21,6 +21,8 @@
import os
import sys
+# update this on each release
+_script_version = (1, 1, 0)
if __doc__ is None:
print "bzr does not support python -OO."
@@ -67,7 +69,7 @@
"\n")
raise
-if bzrlib.version_info[:3] != (0, 93, 0):
+if bzrlib.version_info[:3] != _script_version:
sys.stderr.write("bzr: WARNING: bzrlib version doesn't match the bzr program.\n"
"This may indicate an installation problem.\n"
"bzrlib from %s is version %r\n"
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2007-11-30 03:49:39 +0000
+++ b/bzrlib/__init__.py 2007-12-14 07:35:49 +0000
@@ -35,7 +35,7 @@
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
# releaselevel of 'dev' for unreleased under-development code.
-version_info = (0, 93, 0, 'dev', 0)
+version_info = (1, 1, 0, 'dev', 0)
# API compatibility version: bzrlib is currently API compatible with 0.18.
api_minimum_version = (0, 18, 0)
=== modified file 'bzrlib/bugtracker.py'
--- a/bzrlib/bugtracker.py 2007-11-27 19:27:40 +0000
+++ b/bzrlib/bugtracker.py 2007-12-13 13:33:36 +0000
@@ -39,6 +39,71 @@
"""
+_bugs_help = \
+"""When making a commit, metadata about bugs fixed by that change can be
+recorded by using the --fixes option. For each bug marked as fixed, an
+entry is included in the 'bugs' revision property stating '<url> <status>'.
+Support for Launchpad's central bug tracker is built in. For other bug
+trackers, configuration is required in advance so that the correct URL
+can be recorded.
+
+In addition to Launchpad, Bazaar directly supports the generation of
+URLs appropriate for Bugzilla and Trac. If your project uses a different
+bug tracker, it is easy to add support for it by writing a plugin, say.
+If you use Bugzilla or Trac, then you only need to set a configuration
+variable which contains the base URL of the bug tracker. These options
+can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific
+configuration section in ``locations.conf``. You can set up these values
+for each of the projects you work on.
+
+Note: As you provide a short name for each tracker, you can specify one or
+more bugs in one or more trackers at commit time if you wish.
+
+bugzilla_<tracker_abbreviation>_url
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If present, the location of the Bugzilla bug tracker referred to by
+<tracker_abbreviation>. This option can then be used together with ``bzr commit
+--fixes`` to mark bugs in that tracker as being fixed by that commit. For
+example::
+
+ bugzilla_squid_url = http://www.squid-cache.org/bugs
+
+would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as
+fixed.
+
+trac_<tracker_abbrevation>_url
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If present, the location of the Trac instance referred to by
+<tracker_abbreviation>. This option can then be used together with ``bzr commit
+--fixes`` to mark bugs in that tracker as being fixed by that commit. For
+example::
+
+ trac_twisted_url = http://www.twistedmatrix.com/trac
+
+would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 as
+fixed.
+
+bugtracker_<tracker_abbrevation>_url
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+If present, the location of a generic bug tracker instance referred to by
+<tracker_abbreviation>. The location must contain an ``{id}`` placeholder,
+which will be replaced by a specific bug ID. This option can then be used
+together with ``bzr commit --fixes`` to mark bugs in that tracker as being
+fixed by that commit. For example::
+
+ bugtracker_python_url = http://bugs.python.org/issue{id}
+
+would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's
+Roundup bug tracker as fixed, or::
+
+ bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}
+
+for CPAN's RT bug tracker.
+"""
+
+
def get_bug_url(abbreviated_bugtracker_name, branch, bug_id):
"""Return a URL pointing to the canonical web page of the bug identified by
'bug_id'.
@@ -65,13 +130,7 @@
branch)
def help_topic(self, topic):
- return textwrap.dedent("""\
- Bazaar provides the ability to store information about bugs being fixed
- as metadata on a revision.
-
- For each bug marked as fixed, an entry is included in the 'bugs'
- revision property stating '<url> <status>'.
- """)
+ return _bugs_help
tracker_registry = TrackerRegistry()
=== modified file 'bzrlib/help_topics.py'
--- a/bzrlib/help_topics.py 2007-12-07 03:30:29 +0000
+++ b/bzrlib/help_topics.py 2007-12-13 13:33:36 +0000
@@ -600,8 +600,9 @@
"Help on status flags")
def get_bugs_topic(topic):
from bzrlib import bugtracker
- return "Bug Trackers\n\n" + bugtracker.tracker_registry.help_topic(topic)
-topic_registry.register('bugs', get_bugs_topic, 'Bug tracker support')
+ return "Bug Tracker Settings\n\n" + \
+ bugtracker.tracker_registry.help_topic(topic)
+topic_registry.register('bugs', get_bugs_topic, 'Bug tracker settings')
topic_registry.register('env-variables', _env_variables,
'Environment variable names and values')
topic_registry.register('files', _files,
=== modified file 'bzrlib/tests/test_revision.py'
--- a/bzrlib/tests/test_revision.py 2007-11-30 15:48:27 +0000
+++ b/bzrlib/tests/test_revision.py 2007-12-10 05:03:31 +0000
@@ -134,6 +134,7 @@
sources = br1
br1.lock_read()
+ br2.lock_read()
self.addCleanup(br1.unlock)
br2.lock_read()
self.addCleanup(br2.unlock)
=== modified file 'doc/en/mini-tutorial/index.txt'
--- a/doc/en/mini-tutorial/index.txt 2007-11-27 19:51:08 +0000
+++ b/doc/en/mini-tutorial/index.txt 2007-12-13 22:08:27 +0000
@@ -34,7 +34,7 @@
.. _installation instructions: http://bazaar-vcs.org/WindowsDownloads
.. _install using MacPorts: http://bazaar-vcs.org/MacPorts
.. _Downloads: http://bazaar-vcs.org/Download
-.. _Installation: http://bazaar-vcs.org/InstallationFAQ
+.. _Installation: http://bazaar-vcs.org/InstallationFaq
Introducing yourself
@@ -103,7 +103,7 @@
Making changes to your files
============================
-Let's change a file and commit those changes to your branch.
+Let's change a file and commit that change to your branch.
Edit ``test1.txt`` in your favourite editor, then check what have you done::
@@ -162,13 +162,13 @@
Bazaar will create a ``myproject`` directory on the remote server and
push your branch to it.
+Now anyone can create their own copy of your branch by typing::
+
+ $ bzr branch http://www.example.com/myproject
+
**Note:** to use sftp, you may need to install ``paramiko`` and
``pyCrypto``. See http://bazaar-vcs.org/InstallationFaq for details.
-Now anyone can create their own copy of your branch by typing::
-
- $ bzr branch http://www.example.com/myproject
-
Publishing your branch with Launchpad
=====================================
@@ -263,7 +263,8 @@
Learning more
=============
-You can find out more about Bazaar in the `Bazaar user guide <../../index.html>`_.
+You can find out more about Bazaar in the
+`Bazaar User Guide <../user-guide/index.html>`_.
To learn about Bazaar on the command-line::
=== modified file 'doc/en/user-guide/adv_merging.txt'
--- a/doc/en/user-guide/adv_merging.txt 2007-12-13 07:04:16 +0000
+++ b/doc/en/user-guide/adv_merging.txt 2007-12-14 07:35:49 +0000
@@ -1,5 +1,5 @@
-Advanced merging
-================
+Pseudo merging
+==============
Cherrypicking
-------------
@@ -47,11 +47,6 @@
be done at a later time. In other cases, additional conflicts will need
to be resolved when the changes are merged again.
-Note: The reason why Bazaar doesn't track cherrypicks yet is that doing so
-can lead to poor performance. We are exploring ways of tracking
-this information that perform acceptably and hope to improve Bazaar's
-cherrypicking support in the future accordingly.
-
Reverse cherrypicking
---------------------
@@ -113,4 +108,6 @@
Note: Some users coming from central VCS tools with poor merge tracking
like rebasing because it's similar to how they are use to working in older
tools, or because "perfectly clean" history seems important. Before rebasing
-in Bazaar, think about whether a normal merge is a better choice.
+in Bazaar, think about whether a normal merge is a better choice. In
+particular, rebasing a private branch before sharing it is OK but
+rebasing after sharing a branch with someone else is **strongly** discouraged.
=== modified file 'doc/en/user-guide/bug_trackers.txt'
--- a/doc/en/user-guide/bug_trackers.txt 2007-12-04 18:11:51 +0000
+++ b/doc/en/user-guide/bug_trackers.txt 2007-12-13 13:33:36 +0000
@@ -2,95 +2,53 @@
====================================
Bazaar has a facility that allows you to associate a commit with a bug
-in the project's bug tracker. Other tools can then use this information
-to link between the commit and the bug, or to automatically mark the bug
-closed in the branches that contain the commit.
+in the project's bug tracker. Other tools (or hooks) can then use this
+information to link between the commit and the bug, or to automatically
+mark the bug closed in the branches that contain the commit.
Associating commits and bugs
----------------------------
-When you make a commit you can assiociate it with a bug by using the
+When you make a commit, you can associate it with a bug by using the
``--fixes`` option of ``commit``. For example::
- $ bzr commit --fixes project:12345 -m "Properly close the connection"
-
-This will set a revision property on the revision that is committed
-which contains the URI at which more information on the bug can be found.
-Bazaar itself does no more than this, but once the information is recorded
-other tools can make use of it.
-
-Configuration of the bug tracker
---------------------------------
-
-As each project has it's own bug tracker, and there are many different
-bug tracking systems you must first do some configuration before you
-can use this system.
-
-Bazaar currently implements support for projects that use Bugzilla or
-Trac to manage their bugs. If your project uses a different system it
-is easy to add support for the system, perhaps through a plugin.
-
-If you do use Bugzilla or Trac then you only need to set a configuration
-variable which contains the base URL of the bug tracker. These options
-can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific
-configuration section in ``locations.conf``.
-
-You can set up these values for each of the projects you work on in
-``bazaar.conf``, as you specify a short name for each so that you
-can specify which you mean at commit time.
-
-bugzilla_<tracker_abbreviation>_url
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If present, the location of the Bugzilla bug tracker referred to by
-<tracker_abbreviation>. This option can then be used together with ``bzr commit
---fixes`` to mark bugs in that tracker as being fixed by that commit. For
-example::
-
- bugzilla_squid_url = http://www.squid-cache.org/bugs
-
-would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as
-fixed.
-
-trac_<tracker_abbrevation>_url
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If present, the location of the Trac instance referred to by
-<tracker_abbreviation>. This option can then be used together with ``bzr commit
---fixes`` to mark bugs in that tracker as being fixed by that commit. For
-example::
-
- trac_twisted_url = http://www.twistedmatrix.com/trac
-
-would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 as
-fixed.
-
-bugtracker_<tracker_abbrevation>_url
-------------------------------------
-If present, the location of a generic bug tracker instance referred to by
-<tracker_abbreviation>. The location must contain an ``{id}`` placeholder,
-which will be replaced by a specific bug ID. This option can then be used
-together with ``bzr commit --fixes`` to mark bugs in that tracker as being
-fixed by that commit. For example::
-
- bugtracker_python_url = http://bugs.python.org/issue{id}
-
-would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's
-Roundup bug tracker as fixed, or::
-
- bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}
-
-for CPAN's RT bug tracker.
-
-Limitations of the system
--------------------------
+ $ bzr commit --fixes lp:12345 -m "Properly close the connection"
+
+This records metadata in Bazaar linking the commit with bug 12345 in
+Launchpad. If you use a different bug tracker, it can be given its own
+tracker code (instead of ``lp``) and used instead. For details on how
+to configure this, refer to `Bug Tracker Settings`_ in the Bazaar
+User Reference.
+
+.. _Bug Tracker Settings: ../user-reference/bzr_man.html#bug-tracker-settings
+
+Metadata recording vs bug tracker updating
+------------------------------------------
+
+Recording metadata about bugs fixed at commit time is only
+one of the features needed for complete bug tracker integration.
+As Bazaar is a distributed VCS, users may be offline while committing
+so accessing the bug tracker itself at that time may not be possible.
+Instead, it is recommended that a hook be installed to update
+the bug tracker when changes are pushed to a central location
+appropriate for your project's workflow.
+
+Note: This second processing stage is part of the integration provided
+by Lauchpad when it scans external or hosted branches.
+
+Making corrections
+------------------
This method of associating revisions and bugs does have some limitations. The
first is that the association can only be made at commit time. This means that
if you forget to make the association when you commit, or the bug is reported
-after you fix it you cannot go back and add the link later.
+after you fix it, you generally cannot go back and add the link later.
Related to this is the fact that the association is immutable. If a bug is
-marked as fixed by one commit, but that revision does not fully solve the
-bug, or there is a later regression you cannot go back and remove the link.
+marked as fixed by one commit but that revision does not fully solve the
+bug, or there is a later regression, you cannot go back and remove the link.
+Of course, ``bzr uncommit`` can always be used to undo the last commit in
+order to make it again with the correct options. This is commonly done
+to correct a bad commit message and it equally applies to correcting
+metadata recorded (via ``--fixes`` for example) on the last commit.
=== modified file 'tools/doc_generate/autodoc_rstx.py'
--- a/tools/doc_generate/autodoc_rstx.py 2007-08-07 19:18:38 +0000
+++ b/tools/doc_generate/autodoc_rstx.py 2007-12-13 13:33:36 +0000
@@ -139,7 +139,7 @@
:Version: %(version)s
:Generated: %(datestamp)s
-.. contents::
+.. contents:: :depth: 2
-----
=== modified file 'tools/rst2html.py'
--- a/tools/rst2html.py 2007-08-07 14:56:50 +0000
+++ b/tools/rst2html.py 2007-12-07 06:54:13 +0000
@@ -1,24 +1,39 @@
-#!/usr/bin/env python
+#! /usr/bin/env python
-# Author: David Goodger
-# Contact: goodger at python.org
-# Revision: $Revision: 3901 $
-# Date: $Date: 2005-09-25 17:49:54 +0200 (Sun, 25 Sep 2005) $
-# Copyright: This module has been placed in the public domain.
+# Originally by Dave Goodger, from the docutils, distribution.
+#
+# Modified for Bazaar to accommodate options containing dots
+#
+# This file is in the public domain.
"""
A minimal front end to the Docutils Publisher, producing HTML.
"""
+# modified version for
+
try:
import locale
locale.setlocale(locale.LC_ALL, '')
except:
pass
+import docutils
from docutils.core import publish_cmdline, default_description
+if docutils.__version__ <= '0.4.1':
+ from docutils.parsers.rst.states import Body
+ # we have some option names that contain dot; which is not allowed by
+ # python-docutils 0.4-4 -- so monkeypatch in a better pattern
+ #
+ # This is a bit gross to patch because all this is built up at load time.
+ Body.pats['optname'] = r'[a-zA-Z0-9][a-zA-Z0-9._-]*'
+ Body.pats['longopt'] = r'(--|/)%(optname)s([ =]%(optarg)s)?' % Body.pats
+ Body.pats['option'] = r'(%(shortopt)s|%(longopt)s)' % Body.pats
+ Body.patterns['option_marker'] = r'%(option)s(, %(option)s)*( +| ?$)' % Body.pats
+
+
description = ('Generates (X)HTML documents from standalone reStructuredText '
'sources. ' + default_description)
More information about the bazaar-commits
mailing list