Rev 3992: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/network-name
Robert Collins
robertc at robertcollins.net
Wed Feb 18 21:00:29 GMT 2009
At http://people.ubuntu.com/~robertc/baz2.0/network-name
------------------------------------------------------------
revno: 3992
revision-id: robertc at robertcollins.net-20090218210002-0lnnxjxmrnoj8qdk
parent: andrew.bennetts at canonical.com-20090210054404-tej9hra1kpom9fc2
parent: pqm at pqm.ubuntu.com-20090218132708-okubrahz9exvae9r
committer: Robert Collins <robertc at robertcollins.net>
branch nick: network-name
timestamp: Thu 2009-02-19 08:00:02 +1100
message:
Merge bzr.dev.
added:
bzrlib/help_topics/en/log-formats.txt logformats.txt-20090209081655-5wpbws2oqz8k5oq7-1
bzrlib/plugins/launchpad/test_lp_open.py test_lp_open.py-20090125174355-hxrsxh3sj84225qu-1
bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
doc/developers/colocated-branches.txt colocatedbranches.tx-20090209183539-wv9upczfd8ryyfn1-1
tools/prepare_for_latex.py prepare_for_latex.py-20090212165735-79tn1t4dhnxyz7m9-1
tools/rst2pdf.py rst2pdf.py-20090212165735-79tn1t4dhnxyz7m9-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3990.2.27
revision-id: pqm at pqm.ubuntu.com-20090218132708-okubrahz9exvae9r
parent: pqm at pqm.ubuntu.com-20090218094117-mum4jrw92j9ijj01
parent: jelmer at samba.org-20090218124823-acyczvvcfq9ztg3s
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 13:27:08 +0000
message:
(Jelmer) Point out bzr+ssh:// to the user when they use ssh://.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 3990.35.3
revision-id: jelmer at samba.org-20090218124823-acyczvvcfq9ztg3s
parent: jelmer at samba.org-20090218122204-1lc50dqq145kvd73
parent: pqm at pqm.ubuntu.com-20090218094117-mum4jrw92j9ijj01
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: ssh-hints
timestamp: Wed 2009-02-18 13:48:23 +0100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
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_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 3990.35.2
revision-id: jelmer at samba.org-20090218122204-1lc50dqq145kvd73
parent: jelmer at samba.org-20090217143926-2r3pmqphk99j72ex
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Wed 2009-02-18 13:22:04 +0100
message:
Register ssh: rather than ssh://, avoid referring to smart server, which users may not be familiar with.
modified:
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 3990.35.1
revision-id: jelmer at samba.org-20090217143926-2r3pmqphk99j72ex
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2009-02-17 15:39:26 +0100
message:
Point out bzr+ssh:// to the user when they use ssh://.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 3990.2.26
revision-id: pqm at pqm.ubuntu.com-20090218094117-mum4jrw92j9ijj01
parent: pqm at pqm.ubuntu.com-20090218084918-7d1qa881h8ahpu82
parent: jelmer at samba.org-20090218090055-2bt6b70yrv52zjx4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 09:41:17 +0000
message:
(Jelmer) Support GSSAPI authentication for HTTP and HTTPS.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3990.34.6
revision-id: jelmer at samba.org-20090218090055-2bt6b70yrv52zjx4
parent: jelmer at samba.org-20090217144626-rc6jt0qmfe950fp0
parent: pqm at pqm.ubuntu.com-20090218084918-7d1qa881h8ahpu82
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: http-gssapi
timestamp: Wed 2009-02-18 10:00:55 +0100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
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_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 3990.34.5
revision-id: jelmer at samba.org-20090217144626-rc6jt0qmfe950fp0
parent: jelmer at samba.org-20090217110548-n4k4hh28uhxx0vg1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: http-gssapi
timestamp: Tue 2009-02-17 15:46:26 +0100
message:
Move import next to other system libs, fix format.
modified:
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3990.34.4
revision-id: jelmer at samba.org-20090217110548-n4k4hh28uhxx0vg1
parent: jelmer at samba.org-20090217021059-eyk0hufrwnanok1c
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: http-gssapi
timestamp: Tue 2009-02-17 12:05:48 +0100
message:
review from vila: mention HTTPS, clarify error a bit, move import to top-level.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3990.34.3
revision-id: jelmer at samba.org-20090217021059-eyk0hufrwnanok1c
parent: jelmer at samba.org-20090217015430-62v560na6f1ngybp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: http-gssapi
timestamp: Tue 2009-02-17 03:10:59 +0100
message:
Remove realm support, it's not necessary.
modified:
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3990.34.2
revision-id: jelmer at samba.org-20090217015430-62v560na6f1ngybp
parent: jelmer at samba.org-20090217013950-94zno65wcmx7kvb1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: http-gssapi
timestamp: Tue 2009-02-17 02:54:30 +0100
message:
Only attempt GSSAPI authentication when the kerberos module is present.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3990.34.1
revision-id: jelmer at samba.org-20090217013950-94zno65wcmx7kvb1
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: http-gssapi
timestamp: Tue 2009-02-17 02:39:50 +0100
message:
Add simple support for GSSAPI authentication over HTTP.
modified:
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3990.2.25
revision-id: pqm at pqm.ubuntu.com-20090218084918-7d1qa881h8ahpu82
parent: pqm at pqm.ubuntu.com-20090218051900-z4u214yqxrm7uvtl
parent: jelmer at samba.org-20090216163844-d8n3zc2ah5gudyi8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 08:49:18 +0000
message:
(Daniel) Add help option to shelve prompt.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 3990.33.2
revision-id: jelmer at samba.org-20090216163844-d8n3zc2ah5gudyi8
parent: jelmer at samba.org-20090216163752-hiq812wpsmiuduqp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Mon 2009-02-16 17:38:44 +0100
message:
Move NEWS item to DEVELOPMENT version from 1.12.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3990.33.1
revision-id: jelmer at samba.org-20090216163752-hiq812wpsmiuduqp
parent: pqm at pqm.ubuntu.com-20090216105404-hjw8bck3ocg47wjz
parent: daniel at daniel-watkins.co.uk-20090210004610-9d5uqzyds41pwte4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Mon 2009-02-16 17:37:52 +0100
message:
merge Daniels shelve help patch.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 3990.32.4
revision-id: daniel at daniel-watkins.co.uk-20090210004610-9d5uqzyds41pwte4
parent: daniel at daniel-watkins.co.uk-20090210004348-l5pkl1g9rj9wddpy
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf-prompt
timestamp: Tue 2009-02-10 00:46:10 +0000
message:
Added NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3990.32.3
revision-id: daniel at daniel-watkins.co.uk-20090210004348-l5pkl1g9rj9wddpy
parent: daniel at daniel-watkins.co.uk-20090210004331-bm19sju6432fu3tx
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf-prompt
timestamp: Tue 2009-02-10 00:43:48 +0000
message:
Added help option to shelve prompt.
modified:
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
------------------------------------------------------------
revno: 3990.32.2
revision-id: daniel at daniel-watkins.co.uk-20090210004331-bm19sju6432fu3tx
parent: daniel at daniel-watkins.co.uk-20090210003348-iyfwr4dpfqsvn0ii
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf-prompt
timestamp: Tue 2009-02-10 00:43:31 +0000
message:
Added test for help option.
modified:
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 3990.32.1
revision-id: daniel at daniel-watkins.co.uk-20090210003348-iyfwr4dpfqsvn0ii
parent: pqm at pqm.ubuntu.com-20090209210810-cq9lgqy519b7wfyi
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf-prompt
timestamp: Tue 2009-02-10 00:33:48 +0000
message:
Changed all shelve tests to expect a '?'.
modified:
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 3990.2.24
revision-id: pqm at pqm.ubuntu.com-20090218051900-z4u214yqxrm7uvtl
parent: pqm at pqm.ubuntu.com-20090218044142-j5oegz3puzoi82m1
parent: robertc at robertcollins.net-20090218042104-pf0hqv2bje74rvd1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 05:19:00 +0000
message:
(robertc) Add hpss push tests with hpss call ratchets to prevent
regressions, (Andrew Bennetts, Robert Collins)
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 3990.31.4
revision-id: robertc at robertcollins.net-20090218042104-pf0hqv2bje74rvd1
parent: robertc at robertcollins.net-20090218041442-k28bhmqhwko728u5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Wed 2009-02-18 15:21:04 +1100
message:
Make the ratchet aspect of the blackbox smart server push acceptance tests clearer.
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 3990.31.3
revision-id: robertc at robertcollins.net-20090218041442-k28bhmqhwko728u5
parent: robertc at robertcollins.net-20090218041128-nfgtpku9628f0h5x
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Wed 2009-02-18 15:14:42 +1100
message:
Adjust push acceptance/effort tests for correctness improvements in bzrlib which raised the figure.
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 3990.31.2
revision-id: robertc at robertcollins.net-20090218041128-nfgtpku9628f0h5x
parent: robertc at robertcollins.net-20090218000242-8lj7ewn31dmwh5q3
parent: pqm at pqm.ubuntu.com-20090218040347-uw2nm8ix8udwditt
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Wed 2009-02-18 15:11:28 +1100
message:
Merge bzr.dev for the use-RemoteObjects when initial pushing.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3990.31.1
revision-id: robertc at robertcollins.net-20090218000242-8lj7ewn31dmwh5q3
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Wed 2009-02-18 11:02:42 +1100
message:
Add ratchet style blackbox effort tests for push over bzr+ssh. (Andrew Bennetts, Robert Collins)
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 3990.2.23
revision-id: pqm at pqm.ubuntu.com-20090218044142-j5oegz3puzoi82m1
parent: pqm at pqm.ubuntu.com-20090218040347-uw2nm8ix8udwditt
parent: john at arbash-meinel.com-20090218033847-e5th2txcqscbe4uv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 04:41:42 +0000
message:
(jam) Add a -Dmemory implementation for win32
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 3990.30.3
revision-id: john at arbash-meinel.com-20090218033847-e5th2txcqscbe4uv
parent: john at arbash-meinel.com-20090218032811-cbuu15u5xobpltv9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_mem
timestamp: Tue 2009-02-17 21:38:47 -0600
message:
NEWS about -Dmemory and win32
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3990.30.2
revision-id: john at arbash-meinel.com-20090218032811-cbuu15u5xobpltv9
parent: john at arbash-meinel.com-20090218030943-j3dhzwnijugzim61
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_mem
timestamp: Tue 2009-02-17 21:28:11 -0600
message:
Fix some small bugs, and prefer the ctypes form.
modified:
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 3990.30.1
revision-id: john at arbash-meinel.com-20090218030943-j3dhzwnijugzim61
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_mem
timestamp: Tue 2009-02-17 21:09:43 -0600
message:
Implement -Dmemory for win32
modified:
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 3990.2.22
revision-id: pqm at pqm.ubuntu.com-20090218040347-uw2nm8ix8udwditt
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
parent: robertc at robertcollins.net-20090218032521-m2bl20b63q57mmxj
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 04:03:47 +0000
message:
(robertc) Fix RemoteBranch to be used correctly in tests using
bzr+ssh, to fire off Branch hooks correctly,
and improve the branch_implementations tests to check that making a
branch gets the right format under test. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3990.29.3
revision-id: robertc at robertcollins.net-20090218032521-m2bl20b63q57mmxj
parent: robertc at robertcollins.net-20090218001303-anak652jzjqu02d2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2009-02-18 14:25:21 +1100
message:
Fix test failure due to shared format objects being returned from initialize_on_transport.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3990.29.2
revision-id: robertc at robertcollins.net-20090218001303-anak652jzjqu02d2
parent: robertc at robertcollins.net-20090213005218-yxrgiq7j1du2vldm
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2009-02-18 11:13:03 +1100
message:
Merge bzr.dev [fix NEWS conflicts].
added:
bzrlib/help_topics/en/log-formats.txt logformats.txt-20090209081655-5wpbws2oqz8k5oq7-1
tools/prepare_for_latex.py prepare_for_latex.py-20090212165735-79tn1t4dhnxyz7m9-1
tools/rst2pdf.py rst2pdf.py-20090212165735-79tn1t4dhnxyz7m9-2
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/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3990.29.1
revision-id: robertc at robertcollins.net-20090213005218-yxrgiq7j1du2vldm
parent: pqm at pqm.ubuntu.com-20090212154913-cleqwmh36ss3gswk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: format-on-push
timestamp: Fri 2009-02-13 11:52:18 +1100
message:
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3990.2.21
revision-id: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
parent: pqm at pqm.ubuntu.com-20090216105404-hjw8bck3ocg47wjz
parent: v.ladeuil+lp at free.fr-20090216164456-p95hvdk5u78p2p1e
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-02-16 17:24:48 +0000
message:
(Matthew Fuller,
Marius Kruger) Allow changing --[no-]trees with reconfigure
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3990.28.2
revision-id: v.ladeuil+lp at free.fr-20090216164456-p95hvdk5u78p2p1e
parent: v.ladeuil+lp at free.fr-20090216101544-8zwh9wugth3fa90y
parent: v.ladeuil+lp at free.fr-20090216164354-oq6wugejopvahynr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Mon 2009-02-16 17:44:56 +0100
message:
Allow changing --[no-]trees with reconfigure
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3983.3.11
revision-id: v.ladeuil+lp at free.fr-20090216164354-oq6wugejopvahynr
parent: amanic at gmail.com-20090215234536-xuwmbmdw2ktfj4er
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reconfig-trees
timestamp: Mon 2009-02-16 17:43:54 +0100
message:
Fix indentation as per Aaron's review and then some.
* bzrlib/reconfigure.py:
(Reconfigure.set_repository_trees): Fix indentation.
* bzrlib/errors.py:
(AlreadyWithTrees, AlreadyWithNoTrees): Fix indentation.
* bzrlib/builtins.py:
(cmd_reconfigure): Reformat as last Options are lost in the
RegistryOption formatting.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3983.3.10
revision-id: amanic at gmail.com-20090215234536-xuwmbmdw2ktfj4er
parent: amanic at gmail.com-20090215233527-jo6b5687y17019br
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Mon 2009-02-16 01:45:36 +0200
message:
add test_repository_tree_reconfiguration_not_supported
modified:
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3983.3.9
revision-id: amanic at gmail.com-20090215233527-jo6b5687y17019br
parent: amanic at gmail.com-20090215232929-ncde407p5f2nyb7g
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Mon 2009-02-16 01:35:27 +0200
message:
check error message too
modified:
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3983.3.8
revision-id: amanic at gmail.com-20090215232929-ncde407p5f2nyb7g
parent: amanic at gmail.com-20090215231517-4h8jym2obihhe0sm
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Mon 2009-02-16 01:29:29 +0200
message:
use brakets for long string wrapping
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 3983.3.7
revision-id: amanic at gmail.com-20090215231517-4h8jym2obihhe0sm
parent: amanic at gmail.com-20090215225622-jgw66xjmvrv1vf3h
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Mon 2009-02-16 01:15:17 +0200
message:
apply changes in apply again
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3983.3.6
revision-id: amanic at gmail.com-20090215225622-jgw66xjmvrv1vf3h
parent: amanic at gmail.com-20090206014740-6gbah25yvrkocm6t
parent: pqm at pqm.ubuntu.com-20090215032052-9749wepsy6dgnq9l
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Mon 2009-02-16 00:56:22 +0200
message:
merge with bzr.dev and put the NEWS entry in the IN DEVELOPMENT section
added:
bzrlib/help_topics/en/log-formats.txt logformats.txt-20090209081655-5wpbws2oqz8k5oq7-1
bzrlib/plugins/launchpad/test_lp_open.py test_lp_open.py-20090125174355-hxrsxh3sj84225qu-1
bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
doc/developers/colocated-branches.txt colocatedbranches.tx-20090209183539-wv9upczfd8ryyfn1-1
tools/prepare_for_latex.py prepare_for_latex.py-20090212165735-79tn1t4dhnxyz7m9-1
tools/rst2pdf.py rst2pdf.py-20090212165735-79tn1t4dhnxyz7m9-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/shelf.py prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_shelf.py test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3983.3.5
revision-id: amanic at gmail.com-20090206014740-6gbah25yvrkocm6t
parent: amanic at gmail.com-20090206014504-02t1zvblk0kmqurj
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Fri 2009-02-06 03:47:40 +0200
message:
put bracket back where we found it
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3983.3.4
revision-id: amanic at gmail.com-20090206014504-02t1zvblk0kmqurj
parent: amanic at gmail.com-20090206014019-hx3gq380zo3qxrfp
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Fri 2009-02-06 03:45:04 +0200
message:
Move NEWS to NEW FEATURES section and steal some credit
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3983.3.3
revision-id: amanic at gmail.com-20090206014019-hx3gq380zo3qxrfp
parent: amanic at gmail.com-20090206011136-7pf4507s9f104ku7
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Fri 2009-02-06 03:40:19 +0200
message:
refactor test_make_without_trees_leaves_tree_alone a little
modified:
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
------------------------------------------------------------
revno: 3983.3.2
revision-id: amanic at gmail.com-20090206011136-7pf4507s9f104ku7
parent: amanic at gmail.com-20090205233114-e486iauxjjkwpcrd
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Fri 2009-02-06 03:11:36 +0200
message:
make changes directly in set_repository_trees()
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3983.3.1
revision-id: amanic at gmail.com-20090205233114-e486iauxjjkwpcrd
parent: pqm at pqm.ubuntu.com-20090205110039-w9oelsyvyx160qwy
parent: fullermd at over-yonder.net-20090119084821-jdk3jaz91d0mkm94
committer: Marius Kruger <amanic at gmail.com>
branch nick: reconfig-trees
timestamp: Fri 2009-02-06 01:31:14 +0200
message:
merge Matthew's patch into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3921.4.14
revision-id: fullermd at over-yonder.net-20090119084821-jdk3jaz91d0mkm94
parent: fullermd at over-yonder.net-20090119084648-dvlh1802ug4p0qmt
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Mon 2009-01-19 02:48:21 -0600
message:
Fix set_repository_trees() docstring.
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3921.4.13
revision-id: fullermd at over-yonder.net-20090119084648-dvlh1802ug4p0qmt
parent: fullermd at over-yonder.net-20090119084549-q4wr5mbm0ko14eq4
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Mon 2009-01-19 02:46:48 -0600
message:
Move NEWS entry up to where it belongs.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3921.4.12
revision-id: fullermd at over-yonder.net-20090119084549-q4wr5mbm0ko14eq4
parent: fullermd at over-yonder.net-20090119084402-opbuhrq13v47v07u
parent: pqm at pqm.ubuntu.com-20090119030630-3xdyyi4xj69md8e4
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Mon 2009-01-19 02:45:49 -0600
message:
Merge bzr.dev.
added:
bzrlib/plugins/netrc_credential_store/ netrc_credential_sto-20081006090354-oaoid1olhgk8vevm-1
bzrlib/plugins/netrc_credential_store/__init__.py __init__.py-20081006090402-hd75m8kcrrm0vlz1-1
bzrlib/plugins/netrc_credential_store/tests/ tests-20081006090406-6mddz8j10pux993e-1
bzrlib/plugins/netrc_credential_store/tests/__init__.py __init__.py-20081006090411-vytweyz6sun61d4q-1
bzrlib/plugins/netrc_credential_store/tests/test_netrc.py test_netrc.py-20081006090414-vm3or4tz6c9wk2oi-1
bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
bzrlib/tests/https_server.py https_server.py-20071121173708-aj8zczi0ziwbwz21-1
bzrlib/tests/ssl_certs/ ssl_certs-20071124141654-dc9za9nho2gmzbri-1
bzrlib/tests/ssl_certs/__init__.py __init__.py-20071124141703-j5hr254lm287lyut-8
bzrlib/tests/ssl_certs/ca.crt ca.crt-20071124141703-j5hr254lm287lyut-7
bzrlib/tests/ssl_certs/ca.key ca.key-20071124141703-j5hr254lm287lyut-6
bzrlib/tests/ssl_certs/create_ssls.py create_ssls.py-20071124141703-j5hr254lm287lyut-5
bzrlib/tests/ssl_certs/server.crt server.crt-20071124141703-j5hr254lm287lyut-4
bzrlib/tests/ssl_certs/server.csr server.csr-20071124141703-j5hr254lm287lyut-3
bzrlib/tests/ssl_certs/server_with_pass.key server_with_pass.key-20071124141703-j5hr254lm287lyut-2
bzrlib/tests/ssl_certs/server_without_pass.key server_without_pass.-20071124141703-j5hr254lm287lyut-1
doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
doc/news-template.txt newstemplate.txt-20090113030949-kn6dn0xcj1rd6vmn-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patiencediff.py patiencediff.py-20070721205536-jz8gaykeb7xtampk-1
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/ca_bundle.py ca_bundle.py-20070226091335-84kb1xg1r2jjf858-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3921.4.11
revision-id: fullermd at over-yonder.net-20090119084402-opbuhrq13v47v07u
parent: fullermd at over-yonder.net-20090119080454-05ppx0fs76ktg874
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Mon 2009-01-19 02:44:02 -0600
message:
Add a test that --with-no-trees doesn't touch a branch's existing WT.
modified:
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
------------------------------------------------------------
revno: 3921.4.10
revision-id: fullermd at over-yonder.net-20090119080454-05ppx0fs76ktg874
parent: fullermd at over-yonder.net-20090119075451-8hklzevd34wvgao1
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Mon 2009-01-19 02:04:54 -0600
message:
Stop trying to use _plan_changes() wholesale and just move all the
planning logic into set_repository_trees().
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3921.4.9
revision-id: fullermd at over-yonder.net-20090119075451-8hklzevd34wvgao1
parent: fullermd at over-yonder.net-20090109024355-v3z4gp203of33r7s
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Mon 2009-01-19 01:54:51 -0600
message:
Back out _plan_changes() changes for trees frobbing. It's way more
trouble than it's worth.
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3921.4.8
revision-id: fullermd at over-yonder.net-20090109024355-v3z4gp203of33r7s
parent: fullermd at over-yonder.net-20090109024144-pn20yq3of4l1069s
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 20:43:55 -0600
message:
Mention in NEWS what's been done.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3921.4.7
revision-id: fullermd at over-yonder.net-20090109024144-pn20yq3of4l1069s
parent: fullermd at over-yonder.net-20090108082123-rpb8qwvrzpdyof9l
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 20:41:44 -0600
message:
Add a blackbox test for the expected failure trying to change --trees
on a non-shared repo.
modified:
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
------------------------------------------------------------
revno: 3921.4.6
revision-id: fullermd at over-yonder.net-20090108082123-rpb8qwvrzpdyof9l
parent: fullermd at over-yonder.net-20090108081329-sbdnkdjl1pln61kw
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 02:21:23 -0600
message:
Add blackbox tests for reconfigure {--with-trees,--with-no-trees}.
modified:
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
------------------------------------------------------------
revno: 3921.4.5
revision-id: fullermd at over-yonder.net-20090108081329-sbdnkdjl1pln61kw
parent: fullermd at over-yonder.net-20090108080908-fw6qg39rdfp2o206
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 02:13:29 -0600
message:
Add assertions to the unit tests to make sure the reconfiguration
actually did what it was supposed to.
modified:
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3921.4.4
revision-id: fullermd at over-yonder.net-20090108080908-fw6qg39rdfp2o206
parent: fullermd at over-yonder.net-20090108080725-gxxhc5dv4e5y57pe
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 02:09:08 -0600
message:
Add unit tests for Reconfigure.set_repository_trees().
modified:
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3921.4.3
revision-id: fullermd at over-yonder.net-20090108080725-gxxhc5dv4e5y57pe
parent: fullermd at over-yonder.net-20090108080700-d6qm8ozc11fikvbc
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 02:07:25 -0600
message:
Add --with-trees and --with-no-trees to the 'reconfigure' command.
I'm not incredibly happy with these names. However, the obvious
--trees is too easy to confuse with --tree. These seem a reasonable
choice, if not outstanding.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3921.4.2
revision-id: fullermd at over-yonder.net-20090108080700-d6qm8ozc11fikvbc
parent: fullermd at over-yonder.net-20090108080633-navqvw8hxas109nv
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 02:07:00 -0600
message:
Add support in Reconfigure for manipulating the repository setting for
creating working trees.
modified:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
------------------------------------------------------------
revno: 3921.4.1
revision-id: fullermd at over-yonder.net-20090108080633-navqvw8hxas109nv
parent: pqm at pqm.ubuntu.com-20081229142916-z08eu2alga2acrh6
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: reconfig-trees
timestamp: Thu 2009-01-08 02:06:33 -0600
message:
Add some error classes for manipulating trees/no-trees settings on
repositories.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 3990.2.20
revision-id: pqm at pqm.ubuntu.com-20090216105404-hjw8bck3ocg47wjz
parent: pqm at pqm.ubuntu.com-20090215032052-9749wepsy6dgnq9l
parent: v.ladeuil+lp at free.fr-20090216101544-8zwh9wugth3fa90y
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-02-16 10:54:04 +0000
message:
(vila) Ppa newcomer updates
modified:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
------------------------------------------------------------
revno: 3990.28.1
revision-id: v.ladeuil+lp at free.fr-20090216101544-8zwh9wugth3fa90y
parent: pqm at pqm.ubuntu.com-20090215032052-9749wepsy6dgnq9l
parent: v.ladeuil+lp at free.fr-20090216101356-x1xh3bvpw71bx8fx
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Mon 2009-02-16 11:15:44 +0100
message:
Ppa newcomer updates
modified:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
------------------------------------------------------------
revno: 3990.27.2
revision-id: v.ladeuil+lp at free.fr-20090216101356-x1xh3bvpw71bx8fx
parent: v.ladeuil+lp at free.fr-20090215115556-dhpvcd4z44nyyt3g
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: packaging
timestamp: Mon 2009-02-16 11:13:56 +0100
message:
Fixed as per Matt, Jelmer and John reviews.
* tools/packaging/update-packaging-branches.sh:
Update currently released for ubuntu releases check.
* tools/packaging/update-changelogs.sh:
Add currently released for ubuntu releases check.
* tools/packaging/build-packages.sh:
Add currently released for ubuntu releases check.
* doc/developers/ppa.txt:
Fix typos.
modified:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
------------------------------------------------------------
revno: 3990.27.1
revision-id: v.ladeuil+lp at free.fr-20090215115556-dhpvcd4z44nyyt3g
parent: pqm at pqm.ubuntu.com-20090215032052-9749wepsy6dgnq9l
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: packaging
timestamp: Sun 2009-02-15 12:55:56 +0100
message:
Ppa newcomer updates.
* doc/developers/ppa.txt:
Add and/or update various details encountered when building ppas
for the first time.
modified:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3990.2.19
revision-id: pqm at pqm.ubuntu.com-20090215032052-9749wepsy6dgnq9l
parent: pqm at pqm.ubuntu.com-20090214165408-vlwzj9x1qax0i1b0
parent: jelmer at samba.org-20090214182126-idmhgwihjegufqah
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2009-02-15 03:20:52 +0000
message:
(Jelmer) Use Repository.get_revision_delta() in 'bzr missing -v'
rather than doing the delta locally. (#315048)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
------------------------------------------------------------
revno: 3990.26.1
revision-id: jelmer at samba.org-20090214182126-idmhgwihjegufqah
parent: pqm at pqm.ubuntu.com-20090213220525-f4o6y76g5mjtxb7k
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Sat 2009-02-14 19:21:26 +0100
message:
Use Repository.get_revision_delta() in missing rather than doing the delta
ourselves.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
------------------------------------------------------------
revno: 3990.2.18
revision-id: pqm at pqm.ubuntu.com-20090214165408-vlwzj9x1qax0i1b0
parent: pqm at pqm.ubuntu.com-20090213220525-f4o6y76g5mjtxb7k
parent: colin at gibibit.com-20090212172102-0t7xufywds9l1g33
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2009-02-14 16:54:08 +0000
message:
(Colin D Bennett) Generate PDF version of the User Guide.
added:
tools/prepare_for_latex.py prepare_for_latex.py-20090212165735-79tn1t4dhnxyz7m9-1
tools/rst2pdf.py rst2pdf.py-20090212165735-79tn1t4dhnxyz7m9-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
------------------------------------------------------------
revno: 3990.25.5
revision-id: colin at gibibit.com-20090212172102-0t7xufywds9l1g33
parent: colin at gibibit.com-20090212171833-s8k62ifqy4uf4cxc
committer: Colin D Bennett <colin at gibibit.com>
branch nick: pdf-docs
timestamp: Thu 2009-02-12 09:21:02 -0800
message:
Strip trailing whitespace.
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
tools/prepare_for_latex.py prepare_for_latex.py-20090212165735-79tn1t4dhnxyz7m9-1
------------------------------------------------------------
revno: 3990.25.4
revision-id: colin at gibibit.com-20090212171833-s8k62ifqy4uf4cxc
parent: colin at gibibit.com-20090212171141-bq8gllubhwyfgr52
committer: Colin D Bennett <colin at gibibit.com>
branch nick: pdf-docs
timestamp: Thu 2009-02-12 09:18:33 -0800
message:
Put PDF cleanup in clean-docs target; added note on Inkscape requirement.
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
------------------------------------------------------------
revno: 3990.25.3
revision-id: colin at gibibit.com-20090212171141-bq8gllubhwyfgr52
parent: colin at gibibit.com-20090212170752-roshfon2ckj8atyg
committer: Colin D Bennett <colin at gibibit.com>
branch nick: pdf-docs
timestamp: Thu 2009-02-12 09:11:41 -0800
message:
Ignore all generated PDFs, not just the A4 size document.
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
------------------------------------------------------------
revno: 3990.25.2
revision-id: colin at gibibit.com-20090212170752-roshfon2ckj8atyg
parent: colin at gibibit.com-20090212165739-02xv63odccfmxomw
committer: Colin D Bennett <colin at gibibit.com>
branch nick: pdf-docs
timestamp: Thu 2009-02-12 09:07:52 -0800
message:
Made PDF documents a separate target for people who don't have LaTeX installed.
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
------------------------------------------------------------
revno: 3990.25.1
revision-id: colin at gibibit.com-20090212165739-02xv63odccfmxomw
parent: pqm at pqm.ubuntu.com-20090211011240-gv0zdxmwomt3ndtn
committer: Colin D Bennett <colin at gibibit.com>
branch nick: pdf-docs
timestamp: Thu 2009-02-12 08:57:39 -0800
message:
Generate PDF version of the User Guide.
added:
tools/prepare_for_latex.py prepare_for_latex.py-20090212165735-79tn1t4dhnxyz7m9-1
tools/rst2pdf.py rst2pdf.py-20090212165735-79tn1t4dhnxyz7m9-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
------------------------------------------------------------
revno: 3990.2.17
revision-id: pqm at pqm.ubuntu.com-20090213220525-f4o6y76g5mjtxb7k
parent: pqm at pqm.ubuntu.com-20090213050147-k7dnx3d7rk3uoufh
parent: john at arbash-meinel.com-20090213212416-xdvzbxf0ld5a5cxj
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-02-13 22:05:25 +0000
message:
Merge 1.12 final back into bzr.dev (and the 1.11 tip revision)
added:
bzrlib/help_topics/en/log-formats.txt logformats.txt-20090209081655-5wpbws2oqz8k5oq7-1
modified:
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/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3990.20.3
revision-id: john at arbash-meinel.com-20090213212416-xdvzbxf0ld5a5cxj
parent: john at arbash-meinel.com-20090213212125-aiqf2d1as2pd2xy2
parent: pqm at pqm.ubuntu.com-20090119122508-t03dqq4axqfag58c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2009-02-13 15:24:16 -0600
message:
Merge the 1.11-final into bzr.dev (no changes, just grabbing the tip rev)
------------------------------------------------------------
revno: 3932.7.2
revision-id: pqm at pqm.ubuntu.com-20090119122508-t03dqq4axqfag58c
parent: pqm at pqm.ubuntu.com-20090115082637-f802qau8az1f5awi
parent: mbp at sourcefrog.net-20090119113338-81srt3d42gpqyhqb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.11
timestamp: Mon 2009-01-19 12:25:08 +0000
message:
(mbp) prepare 1.11final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3932.7.1
revision-id: pqm at pqm.ubuntu.com-20090115082637-f802qau8az1f5awi
parent: pqm at pqm.ubuntu.com-20090114230346-i9lm6l9v3gz8zzeu
parent: mbp at sourcefrog.net-20090115074041-a4im46in3f8cb1vd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.11
timestamp: Thu 2009-01-15 08:26:37 +0000
message:
(mbp, for vila) Fix failing test when CompiledChunksToLines is not available.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
------------------------------------------------------------
revno: 3990.20.2
revision-id: john at arbash-meinel.com-20090213212125-aiqf2d1as2pd2xy2
parent: john at arbash-meinel.com-20090212185516-wwdbov5nb7fxat8r
parent: pqm at pqm.ubuntu.com-20090213054838-lkk3nsn89bp3b0yt
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2009-02-13 15:21:25 -0600
message:
Merge bzr 1.12 final
added:
bzrlib/help_topics/en/log-formats.txt logformats.txt-20090209081655-5wpbws2oqz8k5oq7-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3990.9.8
revision-id: pqm at pqm.ubuntu.com-20090213054838-lkk3nsn89bp3b0yt
parent: pqm at pqm.ubuntu.com-20090213042447-0xdv0p882f1ljkkm
parent: mbp at sourcefrog.net-20090213050626-22emxvrezi1dgkdq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.12
timestamp: Fri 2009-02-13 05:48:38 +0000
message:
(mbp) Release 1.12final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3990.24.1
revision-id: mbp at sourcefrog.net-20090213050626-22emxvrezi1dgkdq
parent: pqm at pqm.ubuntu.com-20090213042447-0xdv0p882f1ljkkm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.12
timestamp: Fri 2009-02-13 16:06:26 +1100
message:
Release 1.12
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3990.9.7
revision-id: pqm at pqm.ubuntu.com-20090213042447-0xdv0p882f1ljkkm
parent: pqm at pqm.ubuntu.com-20090213034648-8ze2v2pcaayow7q6
parent: mbp at sourcefrog.net-20090213033852-r33rq1c9hme8jhzk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.12
timestamp: Fri 2009-02-13 04:24:47 +0000
message:
(mbp) Install all Tortoise documentation
modified:
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3990.23.2
revision-id: mbp at sourcefrog.net-20090213033852-r33rq1c9hme8jhzk
parent: mbp at sourcefrog.net-20090213025256-hvktkjemq2odxgzj
parent: mhammond at skippinet.com.au-20090112015534-yfxg50p7mpds9j4v
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.12
timestamp: Fri 2009-02-13 14:38:52 +1100
message:
Install all Tortoise documentation
modified:
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3932.6.1
revision-id: mhammond at skippinet.com.au-20090112015534-yfxg50p7mpds9j4v
parent: pqm at pqm.ubuntu.com-20090109083113-p1thptdqdbf68wix
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.win32binary
timestamp: Mon 2009-01-12 12:55:34 +1100
message:
Include all .html files from the tortoise doc directory.
modified:
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3990.9.6
revision-id: pqm at pqm.ubuntu.com-20090213034648-8ze2v2pcaayow7q6
parent: pqm at pqm.ubuntu.com-20090212193947-qwq2q5ysy7w0htev
parent: mbp at sourcefrog.net-20090213025256-hvktkjemq2odxgzj
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.12
timestamp: Fri 2009-02-13 03:46:48 +0000
message:
(mbp) merge log help improvements
added:
bzrlib/help_topics/en/log-formats.txt logformats.txt-20090209081655-5wpbws2oqz8k5oq7-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
------------------------------------------------------------
revno: 3990.23.1
revision-id: mbp at sourcefrog.net-20090213025256-hvktkjemq2odxgzj
parent: pqm at pqm.ubuntu.com-20090212193947-qwq2q5ysy7w0htev
parent: ian.clatworthy at canonical.com-20090209081918-f1togtefhj7qnrfg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.12
timestamp: Fri 2009-02-13 13:52:56 +1100
message:
merge log help improvements
added:
bzrlib/help_topics/en/log-formats.txt logformats.txt-20090209081655-5wpbws2oqz8k5oq7-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
------------------------------------------------------------
revno: 3974.1.4
revision-id: ian.clatworthy at canonical.com-20090209081918-f1togtefhj7qnrfg
parent: ian.clatworthy at canonical.com-20090130083226-osn2cqtua7ltzvgs
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.log-help
timestamp: Mon 2009-02-09 18:19:18 +1000
message:
log-formats topic and explained range searching
added:
bzrlib/help_topics/en/log-formats.txt logformats.txt-20090209081655-5wpbws2oqz8k5oq7-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3974.1.3
revision-id: ian.clatworthy at canonical.com-20090130083226-osn2cqtua7ltzvgs
parent: ian.clatworthy at canonical.com-20090130082645-yq1ijwtgy7gqfl57
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.log-help
timestamp: Fri 2009-01-30 18:32:26 +1000
message:
tweak configuration settings help
modified:
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
------------------------------------------------------------
revno: 3974.1.2
revision-id: ian.clatworthy at canonical.com-20090130082645-yq1ijwtgy7gqfl57
parent: ian.clatworthy at canonical.com-20090130082617-xmoibxl3tu0rt96u
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.log-help
timestamp: Fri 2009-01-30 18:26:45 +1000
message:
enhanced log help
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3974.1.1
revision-id: ian.clatworthy at canonical.com-20090130082617-xmoibxl3tu0rt96u
parent: pqm at pqm.ubuntu.com-20090130031028-y70uzzpad9c47v09
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.log-help
timestamp: Fri 2009-01-30 18:26:17 +1000
message:
keep section ordering in help
modified:
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
------------------------------------------------------------
revno: 3990.9.5
revision-id: pqm at pqm.ubuntu.com-20090212193947-qwq2q5ysy7w0htev
parent: pqm at pqm.ubuntu.com-20090212190109-rnc6b1svl3nmblu5
parent: john at arbash-meinel.com-20090212161113-bicnzfxkk96aeslv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.12
timestamp: Thu 2009-02-12 19:39:47 +0000
message:
(jam) Fix bug #328135 to avoid circular import logic w/
--development-wt5
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3990.22.1
revision-id: john at arbash-meinel.com-20090212161113-bicnzfxkk96aeslv
parent: pqm at pqm.ubuntu.com-20090211084652-5z7uw3v922pope42
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bug328135
timestamp: Thu 2009-02-12 10:11:13 -0600
message:
Fix bug #328135.
We can't import bzrlib.workingtree_4 before importing bzrlib.workingtree
Circular importing logic causes it to get partially-loaded modules which
cause problems.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3990.9.4
revision-id: pqm at pqm.ubuntu.com-20090212190109-rnc6b1svl3nmblu5
parent: pqm at pqm.ubuntu.com-20090211084652-5z7uw3v922pope42
parent: john at arbash-meinel.com-20090211154501-4xof39g47ykw3z5g
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.12
timestamp: Thu 2009-02-12 19:01:09 +0000
message:
(jam) Update setup.py and build_release.py to handle bzr-svn >= 0.5.0
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
------------------------------------------------------------
revno: 3990.21.2
revision-id: john at arbash-meinel.com-20090211154501-4xof39g47ykw3z5g
parent: john at arbash-meinel.com-20090211153331-04xd8poq6we7jhsj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr.1.12
timestamp: Thu 2009-02-12 02:45:01 +1100
message:
Update build_release for bzr-svn 0.5.0 which now requires subvertpy
modified:
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
------------------------------------------------------------
revno: 3990.21.1
revision-id: john at arbash-meinel.com-20090211153331-04xd8poq6we7jhsj
parent: pqm at pqm.ubuntu.com-20090211084652-5z7uw3v922pope42
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr.1.12
timestamp: Thu 2009-02-12 02:33:31 +1100
message:
add subvertpy as a necessary library.
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3990.9.3
revision-id: pqm at pqm.ubuntu.com-20090211084652-5z7uw3v922pope42
parent: pqm at pqm.ubuntu.com-20090210172934-dzt1iz4ctlhcc8b6
parent: mbp at sourcefrog.net-20090210093903-5gg7y0e91zxup0t4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.12
timestamp: Wed 2009-02-11 08:46:52 +0000
message:
(mbp) prepare 1.12rc1
------------------------------------------------------------
revno: 3990.8.3
revision-id: mbp at sourcefrog.net-20090210093903-5gg7y0e91zxup0t4
parent: mbp at sourcefrog.net-20090210092440-cxbs2qpslelfgfzc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.12
timestamp: Tue 2009-02-10 20:39:03 +1100
message:
prepare 1.12rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3990.20.1
revision-id: john at arbash-meinel.com-20090212185516-wwdbov5nb7fxat8r
parent: pqm at pqm.ubuntu.com-20090212154913-cleqwmh36ss3gswk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2009-02-12 12:55:16 -0600
message:
Related to bug #328674, give a better error for a corrupt dirstate.
modified:
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 3990.2.16
revision-id: pqm at pqm.ubuntu.com-20090213050147-k7dnx3d7rk3uoufh
parent: pqm at pqm.ubuntu.com-20090212154913-cleqwmh36ss3gswk
parent: mbp at sourcefrog.net-20090213034431-4w9dkdi2au8j90h0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-02-13 05:01:47 +0000
message:
(mbp) trivial doc corrections
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 3990.15.2
revision-id: mbp at sourcefrog.net-20090213034431-4w9dkdi2au8j90h0
parent: mbp at sourcefrog.net-20090211021134-2xtxxbq856j17rjm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Fri 2009-02-13 14:44:31 +1100
message:
Remove links to editable api docs; just point to generated ones
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 3990.2.15
revision-id: pqm at pqm.ubuntu.com-20090212154913-cleqwmh36ss3gswk
parent: pqm at pqm.ubuntu.com-20090212062408-yq0glwncmdzo5uzm
parent: jelmer at samba.org-20090212134921-jgaorl4jw1z3h0xa
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-02-12 15:49:13 +0000
message:
(Jelmer) Avoid unnecessarily resolving lazy objects in
Registry.get_prefix().
modified:
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
------------------------------------------------------------
revno: 3990.19.1
revision-id: jelmer at samba.org-20090212134921-jgaorl4jw1z3h0xa
parent: pqm at pqm.ubuntu.com-20090211011240-gv0zdxmwomt3ndtn
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Thu 2009-02-12 14:49:21 +0100
message:
Avoid unnecessarily resolving lazy objects in Registry.get_prefix().
modified:
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
------------------------------------------------------------
revno: 3990.2.14
revision-id: pqm at pqm.ubuntu.com-20090212062408-yq0glwncmdzo5uzm
parent: pqm at pqm.ubuntu.com-20090212043701-kh62kseozbbcaypb
parent: robertc at robertcollins.net-20090212054329-ubctdgf2d39lltbx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-02-12 06:24:08 +0000
message:
(robertc) Allow plugins to specify test runner classes for
cmd_selftest. (Robert Collins)
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
------------------------------------------------------------
revno: 3990.18.4
revision-id: robertc at robertcollins.net-20090212054329-ubctdgf2d39lltbx
parent: robertc at robertcollins.net-20090211234655-zbnw36me1zfzorv0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-result-registry
timestamp: Thu 2009-02-12 16:43:29 +1100
message:
PEP8ification of selftest_kwargs in cmd_selftest.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3990.18.3
revision-id: robertc at robertcollins.net-20090211234655-zbnw36me1zfzorv0
parent: robertc at robertcollins.net-20090211222518-32dloushiwrnzurr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-result-registry
timestamp: Thu 2009-02-12 10:46:55 +1100
message:
Allow extra options to bzrlib.tests.selftest from plugins.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3990.18.2
revision-id: robertc at robertcollins.net-20090211222518-32dloushiwrnzurr
parent: robertc at robertcollins.net-20090211214755-pltzfmev8komxryt
parent: robertc at robertcollins.net-20090211124950-70c4aa2a8ub65d0s
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-result-registry
timestamp: Thu 2009-02-12 09:25:18 +1100
message:
Merge command extension support.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3990.18.1
revision-id: robertc at robertcollins.net-20090211214755-pltzfmev8komxryt
parent: pqm at pqm.ubuntu.com-20090211011240-gv0zdxmwomt3ndtn
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test-result-registry
timestamp: Thu 2009-02-12 08:47:55 +1100
message:
Add library level support for different test runners to bzrlib.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3990.2.13
revision-id: pqm at pqm.ubuntu.com-20090212043701-kh62kseozbbcaypb
parent: pqm at pqm.ubuntu.com-20090212024000-dvdhpm2mela5h6f7
parent: robertc at robertcollins.net-20090212034555-qkepf7soohs34erb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-02-12 04:37:01 +0000
message:
(robertc) Add a new hook Commands['extend_command'] for plugins that
want to alter commands without overriding the entire command.
(Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3990.17.2
revision-id: robertc at robertcollins.net-20090212034555-qkepf7soohs34erb
parent: robertc at robertcollins.net-20090211124950-70c4aa2a8ub65d0s
committer: Robert Collins <robertc at robertcollins.net>
branch nick: extend_command
timestamp: Thu 2009-02-12 14:45:55 +1100
message:
Fix typo in extend_command hook docs.
modified:
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
------------------------------------------------------------
revno: 3990.17.1
revision-id: robertc at robertcollins.net-20090211124950-70c4aa2a8ub65d0s
parent: pqm at pqm.ubuntu.com-20090211011240-gv0zdxmwomt3ndtn
committer: Robert Collins <robertc at robertcollins.net>
branch nick: extend_command
timestamp: Wed 2009-02-11 23:49:50 +1100
message:
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3990.2.12
revision-id: pqm at pqm.ubuntu.com-20090212024000-dvdhpm2mela5h6f7
parent: pqm at pqm.ubuntu.com-20090211033438-3yqumzd9miadfc7r
parent: andrew.bennetts at canonical.com-20090211095436-96dwxqkzc79iybxy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-02-12 02:40:00 +0000
message:
Fix do_body NotImplementedError log spam,
and remove a bit of test cruft. (Andrew Bennetts)
added:
bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
modified:
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
------------------------------------------------------------
revno: 3990.16.3
revision-id: andrew.bennetts at canonical.com-20090211095436-96dwxqkzc79iybxy
parent: andrew.bennetts at canonical.com-20090211094527-pdtj25e4748c2h67
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: request handler tests
timestamp: Wed 2009-02-11 20:54:36 +1100
message:
Add a test that unexpected request bodies trigger a SmartProtocolError from request implementations.
modified:
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
------------------------------------------------------------
revno: 3990.16.2
revision-id: andrew.bennetts at canonical.com-20090211094527-pdtj25e4748c2h67
parent: andrew.bennetts at canonical.com-20090211070642-987ocatad8vcpo9n
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: request handler tests
timestamp: Wed 2009-02-11 20:45:27 +1100
message:
Fix the do_body NotImplementedError log spam.
added:
bzrlib/tests/test_smart_request.py test_smart_request.p-20090211070731-o38wayv3asm25d6a-1
modified:
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
------------------------------------------------------------
revno: 3990.16.1
revision-id: andrew.bennetts at canonical.com-20090211070642-987ocatad8vcpo9n
parent: pqm at pqm.ubuntu.com-20090209210810-cq9lgqy519b7wfyi
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: Delete cruft
timestamp: Wed 2009-02-11 18:06:42 +1100
message:
Remove some cruft from test_smart_transport.
modified:
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
------------------------------------------------------------
revno: 3990.2.11
revision-id: pqm at pqm.ubuntu.com-20090211033438-3yqumzd9miadfc7r
parent: pqm at pqm.ubuntu.com-20090211011240-gv0zdxmwomt3ndtn
parent: mbp at sourcefrog.net-20090211021134-2xtxxbq856j17rjm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-11 03:34:38 +0000
message:
(mbp) minor release docs fix
modified:
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3990.15.1
revision-id: mbp at sourcefrog.net-20090211021134-2xtxxbq856j17rjm
parent: pqm at pqm.ubuntu.com-20090210045418-u1c0p4zpnp6nna3n
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2009-02-11 13:11:34 +1100
message:
Tweak to the announcement mail template so it can be immediately used
modified:
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3990.2.10
revision-id: pqm at pqm.ubuntu.com-20090211011240-gv0zdxmwomt3ndtn
parent: pqm at pqm.ubuntu.com-20090211000730-hzn2dne4230w8vyv
parent: ian.clatworthy at canonical.com-20090211002957-m3f364g9ovnwqm6h
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-11 01:12:40 +0000
message:
Improve shelf documentation & fix backtrace (Daniel Watkins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 3990.14.1
revision-id: ian.clatworthy at canonical.com-20090211002957-m3f364g9ovnwqm6h
parent: pqm at pqm.ubuntu.com-20090211000730-hzn2dne4230w8vyv
parent: daniel at daniel-watkins.co.uk-20090210000903-2ac78kfpjlzpja8b
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Wed 2009-02-11 10:29:57 +1000
message:
Improve shelf documentation & fix backtrace (Daniel Watkins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 3990.13.7
revision-id: daniel at daniel-watkins.co.uk-20090210000903-2ac78kfpjlzpja8b
parent: daniel at daniel-watkins.co.uk-20090209234435-n2owqj4bgjkn4omc
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf
timestamp: Tue 2009-02-10 00:09:03 +0000
message:
Added NEWS entries.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3990.13.6
revision-id: daniel at daniel-watkins.co.uk-20090209234435-n2owqj4bgjkn4omc
parent: daniel at daniel-watkins.co.uk-20090209233654-rk9hduglup3d12yp
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf
timestamp: Mon 2009-02-09 23:44:35 +0000
message:
Improved shelve documentation, as per #327421.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3990.13.5
revision-id: daniel at daniel-watkins.co.uk-20090209233654-rk9hduglup3d12yp
parent: daniel at daniel-watkins.co.uk-20090209233446-k6tovw3vw3a47u8v
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf
timestamp: Mon 2009-02-09 23:36:54 +0000
message:
Improve unshelve documentation, as per #327425.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3990.13.4
revision-id: daniel at daniel-watkins.co.uk-20090209233446-k6tovw3vw3a47u8v
parent: daniel at daniel-watkins.co.uk-20090209233421-xv1oyk5pzgqj931u
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf
timestamp: Mon 2009-02-09 23:34:46 +0000
message:
Don't stack trace with an invalid shelf id.
modified:
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
------------------------------------------------------------
revno: 3990.13.3
revision-id: daniel at daniel-watkins.co.uk-20090209233421-xv1oyk5pzgqj931u
parent: daniel at daniel-watkins.co.uk-20090209232658-npfcqo2ryr5tx414
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf
timestamp: Mon 2009-02-09 23:34:21 +0000
message:
Made error message slightly more friendly.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
------------------------------------------------------------
revno: 3990.13.2
revision-id: daniel at daniel-watkins.co.uk-20090209232658-npfcqo2ryr5tx414
parent: daniel at daniel-watkins.co.uk-20090209232113-ebuwr43alqoldp5i
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf
timestamp: Mon 2009-02-09 23:26:58 +0000
message:
Added InvalidShelfId error and accompanying test.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
------------------------------------------------------------
revno: 3990.13.1
revision-id: daniel at daniel-watkins.co.uk-20090209232113-ebuwr43alqoldp5i
parent: pqm at pqm.ubuntu.com-20090209210810-cq9lgqy519b7wfyi
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: shelf
timestamp: Mon 2009-02-09 23:21:13 +0000
message:
Added test for unshelve being passed an invalid shelf_id.
modified:
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
------------------------------------------------------------
revno: 3990.2.9
revision-id: pqm at pqm.ubuntu.com-20090211000730-hzn2dne4230w8vyv
parent: pqm at pqm.ubuntu.com-20090210201334-ovwbsvsqvsozwomf
parent: ian.clatworthy at canonical.com-20090210231720-iazeb9i4jt52ti77
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-11 00:07:30 +0000
message:
Add merge indication to line format (Neil Martinsen-Burrell)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
------------------------------------------------------------
revno: 3990.12.1
revision-id: ian.clatworthy at canonical.com-20090210231720-iazeb9i4jt52ti77
parent: pqm at pqm.ubuntu.com-20090210201334-ovwbsvsqvsozwomf
parent: nmb at wartburg.edu-20090206225956-vyvdktg2wlaqal9t
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Wed 2009-02-11 09:17:20 +1000
message:
Add merge indication to line format (Neil Martinsen-Burrell)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
------------------------------------------------------------
revno: 3983.2.2
revision-id: nmb at wartburg.edu-20090206225956-vyvdktg2wlaqal9t
parent: nmb at wartburg.edu-20090205200329-bhneu8nhzhdgv0m0
parent: pqm at pqm.ubuntu.com-20090205215322-dlhyepy2fid5i7w6
committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
branch nick: long-line-merge-indicators
timestamp: Fri 2009-02-06 16:59:56 -0600
message:
merged bzr.dev
modified:
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3983.2.1
revision-id: nmb at wartburg.edu-20090205200329-bhneu8nhzhdgv0m0
parent: pqm at pqm.ubuntu.com-20090205110039-w9oelsyvyx160qwy
committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
branch nick: long-line-merge-indicators
timestamp: Thu 2009-02-05 14:03:29 -0600
message:
add merge indication to the line format
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3990.2.8
revision-id: pqm at pqm.ubuntu.com-20090210201334-ovwbsvsqvsozwomf
parent: pqm at pqm.ubuntu.com-20090210104600-o9xd7lm1d91067oj
parent: john at arbash-meinel.com-20090210193316-muszy92rqm7xvs7k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-02-10 20:13:34 +0000
message:
(jam) Merge bzr-1.12rc1 back into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3990.11.2
revision-id: john at arbash-meinel.com-20090210193316-muszy92rqm7xvs7k
parent: john at arbash-meinel.com-20090210192925-6pexwm5u4w6k5vpv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2009-02-10 13:33:16 -0600
message:
Move the new work out of bzr-1.12 and into IN DEVELOPMENT
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3990.11.1
revision-id: john at arbash-meinel.com-20090210192925-6pexwm5u4w6k5vpv
parent: pqm at pqm.ubuntu.com-20090210104600-o9xd7lm1d91067oj
parent: pqm at pqm.ubuntu.com-20090210172934-dzt1iz4ctlhcc8b6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2009-02-10 13:29:25 -0600
message:
Merge bzr.1.12rc1 back into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3990.9.2
revision-id: pqm at pqm.ubuntu.com-20090210172934-dzt1iz4ctlhcc8b6
parent: pqm at pqm.ubuntu.com-20090210100738-sf13wwla8iwa02bb
parent: john at arbash-meinel.com-20090210164322-7qsn8ou1z9cxgfx5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.12
timestamp: Tue 2009-02-10 17:29:34 +0000
message:
(mbp) Release 1.12rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3990.10.1
revision-id: john at arbash-meinel.com-20090210164322-7qsn8ou1z9cxgfx5
parent: pqm at pqm.ubuntu.com-20090210100738-sf13wwla8iwa02bb
author: Martin Pool <mbp at sourcefrog.net>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.12-rc1-release
timestamp: Tue 2009-02-10 10:43:22 -0600
message:
Release 1.12rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3990.9.1
revision-id: pqm at pqm.ubuntu.com-20090210100738-sf13wwla8iwa02bb
parent: pqm at pqm.ubuntu.com-20090210045418-u1c0p4zpnp6nna3n
parent: mbp at sourcefrog.net-20090210092440-cxbs2qpslelfgfzc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.12
timestamp: Tue 2009-02-10 10:07:38 +0000
message:
(mbp) merge fix for SSLFile readline problem
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3990.8.2
revision-id: mbp at sourcefrog.net-20090210092440-cxbs2qpslelfgfzc
parent: mbp at sourcefrog.net-20090210063537-6k1fpm1pm4vpnhzq
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.12
timestamp: Tue 2009-02-10 20:24:40 +1100
message:
Cope with read_bundle_from_url deprecation in test_http
modified:
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
------------------------------------------------------------
revno: 3990.8.1
revision-id: mbp at sourcefrog.net-20090210063537-6k1fpm1pm4vpnhzq
parent: pqm at pqm.ubuntu.com-20090210045418-u1c0p4zpnp6nna3n
parent: v.ladeuil+lp at free.fr-20090209182543-nb0220ksr5xa20pg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.12
timestamp: Tue 2009-02-10 17:35:37 +1100
message:
merge SSLFile readline fix
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3988.2.1
revision-id: v.ladeuil+lp at free.fr-20090209182543-nb0220ksr5xa20pg
parent: pqm at pqm.ubuntu.com-20090209040048-4w0lmgdasmdw5xdn
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: httplib-broken-readline
timestamp: Mon 2009-02-09 19:25:43 +0100
message:
Workaround SSLFile wrong readline prototype and fix bogus tests.
* bzrlib/tests/test_read_bundle.py:
(load_tests): Not all tests are parametrized.
(TestDeprecations): Deprecate read_bundle_from_url.
(TestReadBundleFromURL.test_read_mergeable_from_url): Test
read_mergeable_from_url instead of read_bundle_from_url which has
no possible_transports parameter and is deprecated.
(TestReadBundleFromURL.test_read_mergeable_respects_possible_transports):
Fix the test so that it respects the transport class it's supposed
to use.
* bzrlib/transport/http/_urllib2_wrappers.py:
(_ReportingFileSocket.readline): Workaround bug in httplib for
python-2.4 and 2.5.
modified:
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
revno: 3990.2.7
revision-id: pqm at pqm.ubuntu.com-20090210104600-o9xd7lm1d91067oj
parent: pqm at pqm.ubuntu.com-20090210062949-kj7rpejso2405ug1
parent: ian.clatworthy at canonical.com-20090210093043-nh3umt89gstbl89i
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-02-10 10:46:00 +0000
message:
Show all merged revisions in commit template (Colin Bennett)
modified:
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
------------------------------------------------------------
revno: 3990.7.1
revision-id: ian.clatworthy at canonical.com-20090210093043-nh3umt89gstbl89i
parent: pqm at pqm.ubuntu.com-20090210062949-kj7rpejso2405ug1
parent: colin at gibibit.com-20090130082438-hl7t8y6z6feejnnc
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Tue 2009-02-10 19:30:43 +1000
message:
Show all merged revisions in commit template (Colin Bennett)
modified:
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
------------------------------------------------------------
revno: 3968.1.1
revision-id: colin at gibibit.com-20090130082438-hl7t8y6z6feejnnc
parent: pqm at pqm.ubuntu.com-20090128215712-i4lsbqdybozsp19x
committer: Colin D Bennett <colin at gibibit.com>
branch nick: commit_show_all_merge_revisions
timestamp: Fri 2009-01-30 00:24:38 -0800
message:
Show all pending merge revisions in the commit message template.
Instead of showing only the merge tip revisions, show all pending merge
revisions like 'status -v' does, since it will not cause important
information to scroll off the screen as might happen in the status command.
modified:
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
------------------------------------------------------------
revno: 3990.2.6
revision-id: pqm at pqm.ubuntu.com-20090210062949-kj7rpejso2405ug1
parent: pqm at pqm.ubuntu.com-20090210045418-u1c0p4zpnp6nna3n
parent: ian.clatworthy at canonical.com-20090210054745-13deihx0x1om2i0m
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-02-10 06:29:49 +0000
message:
Add --no-tree option to bzr branch (Daniel Watkins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
------------------------------------------------------------
revno: 3990.6.1
revision-id: ian.clatworthy at canonical.com-20090210054745-13deihx0x1om2i0m
parent: pqm at pqm.ubuntu.com-20090210045418-u1c0p4zpnp6nna3n
parent: daniel at daniel-watkins.co.uk-20090210032428-y0y9utt6kwov9h2l
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Tue 2009-02-10 15:47:45 +1000
message:
Add --no-tree option to bzr branch (Daniel Watkins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
------------------------------------------------------------
revno: 3983.1.11
revision-id: daniel at daniel-watkins.co.uk-20090210032428-y0y9utt6kwov9h2l
parent: daniel at daniel-watkins.co.uk-20090210031250-15o0i4q8e9tqy86h
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 273993-branch-no-tree
timestamp: Tue 2009-02-10 03:24:28 +0000
message:
Old BzrDirs which must have working trees are now allowed for in the test.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3983.1.10
revision-id: daniel at daniel-watkins.co.uk-20090210031250-15o0i4q8e9tqy86h
parent: daniel at daniel-watkins.co.uk-20090210030835-evrni0nidfr1qaaj
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 273993-branch-no-tree
timestamp: Tue 2009-02-10 03:12:50 +0000
message:
Made exception message slightly better.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
------------------------------------------------------------
revno: 3983.1.9
revision-id: daniel at daniel-watkins.co.uk-20090210030835-evrni0nidfr1qaaj
parent: daniel at daniel-watkins.co.uk-20090210030813-tb9tt438j9bpek9r
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 273993-branch-no-tree
timestamp: Tue 2009-02-10 03:08:35 +0000
message:
Wrapped long line.
modified:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3983.1.8
revision-id: daniel at daniel-watkins.co.uk-20090210030813-tb9tt438j9bpek9r
parent: daniel at daniel-watkins.co.uk-20090208090702-8iisfmhhsdrpfgcq
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 273993-branch-no-tree
timestamp: Tue 2009-02-10 03:08:13 +0000
message:
Added MustHaveWorkingTree error and accompanying test.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
------------------------------------------------------------
revno: 3983.1.7
revision-id: daniel at daniel-watkins.co.uk-20090208090702-8iisfmhhsdrpfgcq
parent: daniel at daniel-watkins.co.uk-20090207152002-4c2r8sgjepfzsqna
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 273993-branch-no-tree
timestamp: Sun 2009-02-08 10:07:02 +0100
message:
Review comments from jam.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3983.1.6
revision-id: daniel at daniel-watkins.co.uk-20090207152002-4c2r8sgjepfzsqna
parent: daniel at daniel-watkins.co.uk-20090207151235-8qovn4cl9ka90jaq
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 273993-branch-no-tree
timestamp: Sat 2009-02-07 16:20:02 +0100
message:
Added NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3983.1.5
revision-id: daniel at daniel-watkins.co.uk-20090207151235-8qovn4cl9ka90jaq
parent: daniel at daniel-watkins.co.uk-20090207145655-5d34p9sb2zpb0lgj
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 273993-branch-no-tree
timestamp: Sat 2009-02-07 16:12:35 +0100
message:
Added blackbox test.
modified:
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
------------------------------------------------------------
revno: 3983.1.4
revision-id: daniel at daniel-watkins.co.uk-20090207145655-5d34p9sb2zpb0lgj
parent: daniel at daniel-watkins.co.uk-20090207145550-12avn75rmdpoplsd
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 273993-branch-no-tree
timestamp: Sat 2009-02-07 15:56:55 +0100
message:
Added 'no_tree' parameter to BzrDirPreSplitOut.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3983.1.3
revision-id: daniel at daniel-watkins.co.uk-20090207145550-12avn75rmdpoplsd
parent: daniel at daniel-watkins.co.uk-20090207142735-hc5el0i1gllok8dl
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 273993-branch-no-tree
timestamp: Sat 2009-02-07 15:55:50 +0100
message:
Added test to ensure BzrDirs accept the 'no_tree' argument.
modified:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3983.1.2
revision-id: daniel at daniel-watkins.co.uk-20090207142735-hc5el0i1gllok8dl
parent: daniel at daniel-watkins.co.uk-20090207140502-ypcx3olm27z3hee4
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 273993-branch-no-tree
timestamp: Sat 2009-02-07 15:27:35 +0100
message:
Minor cleanup.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3983.1.1
revision-id: daniel at daniel-watkins.co.uk-20090207140502-ypcx3olm27z3hee4
parent: pqm at pqm.ubuntu.com-20090205110039-w9oelsyvyx160qwy
parent: john.klinger at gmail.com-20080403013611-pjr0meocc1lcr5by
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 273993-branch-no-tree
timestamp: Sat 2009-02-07 15:05:02 +0100
message:
Merged John Klinger's original work.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3327.2.1
revision-id: john.klinger at gmail.com-20080403013611-pjr0meocc1lcr5by
parent: pqm at pqm.ubuntu.com-20080402090835-uq4ef5jnwo7opd9t
committer: John Klinger <john.klinger at gmail.com>
branch nick: no-tree
timestamp: Thu 2008-04-03 13:36:11 +1200
message:
Added --no-trees option to branch command
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3990.2.5
revision-id: pqm at pqm.ubuntu.com-20090210045418-u1c0p4zpnp6nna3n
parent: pqm at pqm.ubuntu.com-20090210022243-eobdt6wezitsxs65
parent: jelmer at samba.org-20090210041044-42lmb09hskt9lt9l
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-02-10 04:54:18 +0000
message:
(Jelmer) Add specification for colocated branches.
added:
doc/developers/colocated-branches.txt colocatedbranches.tx-20090209183539-wv9upczfd8ryyfn1-1
------------------------------------------------------------
revno: 3988.1.3
revision-id: jelmer at samba.org-20090210041044-42lmb09hskt9lt9l
parent: jelmer at samba.org-20090210035655-u1r2ve25jc9c4a4h
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2009-02-10 05:10:44 +0100
message:
Review from Ian.
modified:
doc/developers/colocated-branches.txt colocatedbranches.tx-20090209183539-wv9upczfd8ryyfn1-1
------------------------------------------------------------
revno: 3988.1.2
revision-id: jelmer at samba.org-20090210035655-u1r2ve25jc9c4a4h
parent: jelmer at samba.org-20090209183547-rkky1894rwhkl7gn
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2009-02-10 04:56:55 +0100
message:
Review from Daniel.
modified:
doc/developers/colocated-branches.txt colocatedbranches.tx-20090209183539-wv9upczfd8ryyfn1-1
------------------------------------------------------------
revno: 3988.1.1
revision-id: jelmer at samba.org-20090209183547-rkky1894rwhkl7gn
parent: pqm at pqm.ubuntu.com-20090209040048-4w0lmgdasmdw5xdn
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Mon 2009-02-09 19:35:47 +0100
message:
Add specification for colocated-branches.
added:
doc/developers/colocated-branches.txt colocatedbranches.tx-20090209183539-wv9upczfd8ryyfn1-1
------------------------------------------------------------
revno: 3990.2.4
revision-id: pqm at pqm.ubuntu.com-20090210022243-eobdt6wezitsxs65
parent: pqm at pqm.ubuntu.com-20090210011204-6m3q6f6o07xmzthe
parent: ian.clatworthy at canonical.com-20090210013833-jnmv3g2apy53t64k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-02-10 02:22:43 +0000
message:
helper function when only one revision required (Daniel Watkins)
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3990.5.1
revision-id: ian.clatworthy at canonical.com-20090210013833-jnmv3g2apy53t64k
parent: pqm at pqm.ubuntu.com-20090210011204-6m3q6f6o07xmzthe
parent: daniel at daniel-watkins.co.uk-20090208235825-0tw1nxdmas85m2sb
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Tue 2009-02-10 11:38:33 +1000
message:
helper function when only one revision required (Daniel Watkins)
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3984.3.9
revision-id: daniel at daniel-watkins.co.uk-20090208235825-0tw1nxdmas85m2sb
parent: daniel at daniel-watkins.co.uk-20090208235506-2zz2dhzoz02hhjw2
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 1revision
timestamp: Mon 2009-02-09 00:58:25 +0100
message:
Converted cmd_push.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3984.3.8
revision-id: daniel at daniel-watkins.co.uk-20090208235506-2zz2dhzoz02hhjw2
parent: daniel at daniel-watkins.co.uk-20090208234809-wduacw8v6haynq6n
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 1revision
timestamp: Mon 2009-02-09 00:55:06 +0100
message:
Converted cmd_pull.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3984.3.7
revision-id: daniel at daniel-watkins.co.uk-20090208234809-wduacw8v6haynq6n
parent: daniel at daniel-watkins.co.uk-20090208000516-uwdxbgnh27nytm3f
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 1revision
timestamp: Mon 2009-02-09 00:48:09 +0100
message:
Fixed incorrect calls.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3984.3.6
revision-id: daniel at daniel-watkins.co.uk-20090208000516-uwdxbgnh27nytm3f
parent: daniel at daniel-watkins.co.uk-20090207235441-igbvmxlrs7nz966p
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 1revision
timestamp: Sun 2009-02-08 01:05:16 +0100
message:
Converted cmd_inventory to use _get_one_revision.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3984.3.5
revision-id: daniel at daniel-watkins.co.uk-20090207235441-igbvmxlrs7nz966p
parent: daniel at daniel-watkins.co.uk-20090207234527-4ophu2a14lo3vor3
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 1revision
timestamp: Sun 2009-02-08 00:54:41 +0100
message:
Changed from option type to helper function.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
------------------------------------------------------------
revno: 3984.3.4
revision-id: daniel at daniel-watkins.co.uk-20090207234527-4ophu2a14lo3vor3
parent: daniel at daniel-watkins.co.uk-20090207234233-r2hi27q93rqb7x9f
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 1revision
timestamp: Sun 2009-02-08 00:45:27 +0100
message:
Converted cmd_checkout to use 1revision.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3984.3.3
revision-id: daniel at daniel-watkins.co.uk-20090207234233-r2hi27q93rqb7x9f
parent: daniel at daniel-watkins.co.uk-20090207234212-bztfd7e5ugi2v8ep
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 1revision
timestamp: Sun 2009-02-08 00:42:33 +0100
message:
Converted cmd_branch to use 1revision.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3984.3.2
revision-id: daniel at daniel-watkins.co.uk-20090207234212-bztfd7e5ugi2v8ep
parent: daniel at daniel-watkins.co.uk-20090207233519-uaw8k5kw7mkgdnqw
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 1revision
timestamp: Sun 2009-02-08 00:42:12 +0100
message:
1revision provides a revision, rather than a one-tuple containing a revision.
modified:
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
------------------------------------------------------------
revno: 3984.3.1
revision-id: daniel at daniel-watkins.co.uk-20090207233519-uaw8k5kw7mkgdnqw
parent: pqm at pqm.ubuntu.com-20090205215322-dlhyepy2fid5i7w6
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 1revision
timestamp: Sun 2009-02-08 00:35:19 +0100
message:
Initial implementation of 1revision option.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
------------------------------------------------------------
revno: 3990.2.3
revision-id: pqm at pqm.ubuntu.com-20090210011204-6m3q6f6o07xmzthe
parent: pqm at pqm.ubuntu.com-20090210001553-5qi19ufmh3sx18mq
parent: ian.clatworthy at canonical.com-20090210002926-vwwy1thd31pmwsq5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-02-10 01:12:04 +0000
message:
Handle non-existent files in status (Karl Fogel, #306394)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
------------------------------------------------------------
revno: 3990.4.1
revision-id: ian.clatworthy at canonical.com-20090210002926-vwwy1thd31pmwsq5
parent: pqm at pqm.ubuntu.com-20090210001553-5qi19ufmh3sx18mq
parent: ian.clatworthy at canonical.com-20090210002246-bj56cq97fhdo951e
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Tue 2009-02-10 10:29:26 +1000
message:
Handle non-existent files in status (Karl Fogel, #306394)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
------------------------------------------------------------
revno: 3930.2.17
revision-id: ian.clatworthy at canonical.com-20090210002246-bj56cq97fhdo951e
parent: kfogel at red-bean.com-20090202050833-z7vtzhzcscmr2z9o
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.status-nonexistent
timestamp: Tue 2009-02-10 10:22:46 +1000
message:
split tests as suggested by Jelmer's review
modified:
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
------------------------------------------------------------
revno: 3930.2.16
revision-id: kfogel at red-bean.com-20090202050833-z7vtzhzcscmr2z9o
parent: kfogel at red-bean.com-20090202025320-ekw0k1xfm22v7hh4
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Mon 2009-02-02 00:08:33 -0500
message:
* bzrlib/tests/blackbox/test_status.py
(BranchStatus.test_status_nonexistent_file): In introductory
comment, restore wording about expecting an error, since we are now
erroring after all. This undoes part of revno 3935 (bug #306394).
modified:
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
------------------------------------------------------------
revno: 3930.2.15
revision-id: kfogel at red-bean.com-20090202025320-ekw0k1xfm22v7hh4
parent: kfogel at red-bean.com-20090202023311-tagecu0agdunc1rl
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Sun 2009-02-01 21:53:20 -0500
message:
Part of bug #306394: Ensure sorted order for nonexistent file output.
* bzrlib/status.py
(_filter_nonexistent): Sort the path lists before returning them.
* bzrlib/status.py
(show_tree_status): Don't sort here, as it's done earlier now.
modified:
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
------------------------------------------------------------
revno: 3930.2.14
revision-id: kfogel at red-bean.com-20090202023311-tagecu0agdunc1rl
parent: kfogel at red-bean.com-20090202004721-657p8hfk6hm2p001
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Sun 2009-02-01 21:33:11 -0500
message:
* NEWS (BUG FIXES): Minor wording tweak, re bug #306394.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3930.2.13
revision-id: kfogel at red-bean.com-20090202004721-657p8hfk6hm2p001
parent: kfogel at red-bean.com-20090201234532-uzcsf0aliwzzmnf9
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Sun 2009-02-01 19:47:21 -0500
message:
Part of bug #306394: Raise an error (code 3) when status is invoked on
nonexistent files; adjust tests to expect same.
After this change, bzr still prints nonexistent files in the normal
status output (under "nonexistent:", or with "X" in --short format),
but then errors at the end so the user knows they ran status on
non-existent files, and to match how commit would behave if invoked on
the same arguments.
This resulted from a conversation with Robert Collins in IRC, later
immortalized in https://lists.ubuntu.com/archives/bazaar/2009q1/052295.html.
* bzrlib/status.py
(show_tree_status): If there are nonexistent files, raise an error
about them at the very end.
* bzr/bzr-repo/bzr.dev-306394/bzrlib/tests/blackbox/test_status.py
(BranchStatus.test_status_nonexistent_file): Expect the error.
* bzrlib/tests/blackbox/test_status.py
(BranchStatus.test_tree_status_specific_files): Restore the
expectation of error that was lost in revno 3935.
* NEWS
(BUG FIXES): Update the description of the new behavior.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
------------------------------------------------------------
revno: 3930.2.12
revision-id: kfogel at red-bean.com-20090201234532-uzcsf0aliwzzmnf9
parent: kfogel at red-bean.com-20090201192538-px8d6l3anbkw11b7
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Sun 2009-02-01 18:45:32 -0500
message:
Part of bug #306394: Add regression tests.
* bzr/bzr-repo/bzr.dev-306394/bzrlib/tests/blackbox/test_status.py
(BranchStatus.test_status_nonexistent_file): Rewrite for new behavior.
modified:
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
------------------------------------------------------------
revno: 3930.2.11
revision-id: kfogel at red-bean.com-20090201192538-px8d6l3anbkw11b7
parent: kfogel at red-bean.com-20090131000930-h986q3k4zumgvmtk
parent: pqm at pqm.ubuntu.com-20090131231933-8o4phfvmuuizyyn6
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Sun 2009-02-01 14:25:38 -0500
message:
Merge changes from mainline, via local trunk.
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
------------------------------------------------------------
revno: 3930.2.10
revision-id: kfogel at red-bean.com-20090131000930-h986q3k4zumgvmtk
parent: kfogel at red-bean.com-20090130191710-dg41w3jxhg8ba3w7
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Fri 2009-01-30 19:09:30 -0500
message:
Two followup changes related to the fix for bug #306394:
* bzrlib/help_topics/__init__.py
(_status_flags): Describe new "X" status.
* NEWS (BUG FIXES): List the new behavior here, somewhat arbitrarily
choosing this location over "IMPROVEMENTS".
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3930.2.9
revision-id: kfogel at red-bean.com-20090130191710-dg41w3jxhg8ba3w7
parent: kfogel at red-bean.com-20090121062351-d4fqiuma0ly73gta
parent: pqm at pqm.ubuntu.com-20090130185542-dbj7mapm1fvtwm3y
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Fri 2009-01-30 14:17:10 -0500
message:
Merge from mainline, via local trunk.
added:
bzrlib/tests/branch_implementations/test_dotted_revno_to_revision_id.py test_dotted_revno_to-20090121014844-6x7d9jtri5sspg1o-1
bzrlib/tests/branch_implementations/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
bzrlib/tests/branch_implementations/test_revision_id_to_dotted_revno.py test_revision_id_to_-20090122052032-g3czslif6sdqfkh3-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/foreign.py foreign.py-20081112170002-olsxmandkk8qyfuq-1
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/test_foreign.py test_foreign.py-20081125004048-ywb901edgp9lluxo-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
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/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
doc/developers/plugin-api.txt pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
------------------------------------------------------------
revno: 3930.2.8
revision-id: kfogel at red-bean.com-20090121062351-d4fqiuma0ly73gta
parent: kfogel at red-bean.com-20090115201644-f1p6k3kmwltyoex8
parent: pqm at pqm.ubuntu.com-20090120210300-641tutf1rkdn8a3n
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Wed 2009-01-21 01:23:51 -0500
message:
Merge from mainline.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
------------------------------------------------------------
revno: 3930.2.7
revision-id: kfogel at red-bean.com-20090115201644-f1p6k3kmwltyoex8
parent: kfogel at red-bean.com-20090115190924-6fd31v7e57umhqsi
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Thu 2009-01-15 15:16:44 -0500
message:
* bzrlib/tests/blackbox/test_status.py
(BranchStatus.test_status_nonexistent_file): Remove debugging code.
modified:
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
------------------------------------------------------------
revno: 3930.2.6
revision-id: kfogel at red-bean.com-20090115190924-6fd31v7e57umhqsi
parent: kfogel at red-bean.com-20090115190630-1e4ck3ma14d5hmri
parent: pqm at pqm.ubuntu.com-20090115163104-30i51kcr1zepm2f7
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Thu 2009-01-15 14:09:24 -0500
message:
Merge from mainline, via local trunk.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/test_delta.py test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 3930.2.5
revision-id: kfogel at red-bean.com-20090115190630-1e4ck3ma14d5hmri
parent: kfogel at red-bean.com-20090114011842-xhcw9hhtrwtz8wfk
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Thu 2009-01-15 14:06:30 -0500
message:
* bzrlib/tests/blackbox/test_status.py
(BranchStatus.test_status_nonexistent_file): Expect the new behavior.
(BranchStatus.test_tree_status_specific_files): Don't expect error.
modified:
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
------------------------------------------------------------
revno: 3930.2.4
revision-id: kfogel at red-bean.com-20090114011842-xhcw9hhtrwtz8wfk
parent: kfogel at red-bean.com-20090113175526-j9r5jmjiw5lp6ml5
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Tue 2009-01-13 20:18:42 -0500
message:
* bzrlib/status.py
(_filter_nonexistent): Give "filter_nonexistent" an underscore
prefix, as it is not used outside this file. Caller changed.
modified:
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
------------------------------------------------------------
revno: 3930.2.3
revision-id: kfogel at red-bean.com-20090113175526-j9r5jmjiw5lp6ml5
parent: kfogel at red-bean.com-20090108210756-lv0v40emd2z3r2cd
parent: kfogel at red-bean.com-20090113175350-ua7s18ga1baf4r7f
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Tue 2009-01-13 12:55:26 -0500
message:
Merge from mainline.
added:
bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
doc/news-template.txt newstemplate.txt-20090113030949-kn6dn0xcj1rd6vmn-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3930.1.2
revision-id: kfogel at red-bean.com-20090113175350-ua7s18ga1baf4r7f
parent: kfogel at red-bean.com-20090108210552-4cv8mvc6sv0gdbn1
parent: pqm at pqm.ubuntu.com-20090113051424-nrk3zkfe09h46i9y
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-trunk
timestamp: Tue 2009-01-13 12:53:50 -0500
message:
Merge from mainline.
added:
bzrlib/tests/blackbox/test_filesystem_cicp.py test_filesystem_cicp-20081028010456-vclkg401m81keaxc-1
doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
doc/news-template.txt newstemplate.txt-20090113030949-kn6dn0xcj1rd6vmn-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3930.2.2
revision-id: kfogel at red-bean.com-20090108210756-lv0v40emd2z3r2cd
parent: kfogel at red-bean.com-20090108210607-5fvq8opxpq171zwg
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Thu 2009-01-08 16:07:56 -0500
message:
* bzrlib/status.py
(filter_nonexistent): Replaces _raise_if_nonexistent, and now
return two lists instead of raising an error.
(show_tree_status): Use above to print the status of nonexistent
files in the normal status style.
modified:
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
------------------------------------------------------------
revno: 3930.2.1
revision-id: kfogel at red-bean.com-20090108210607-5fvq8opxpq171zwg
parent: pqm at pqm.ubuntu.com-20090108195901-lechto0ubxsirqrd
parent: kfogel at red-bean.com-20090108210552-4cv8mvc6sv0gdbn1
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-306394
timestamp: Thu 2009-01-08 16:06:07 -0500
message:
Merge from mainline, via local trunk.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
------------------------------------------------------------
revno: 3930.1.1
revision-id: kfogel at red-bean.com-20090108210552-4cv8mvc6sv0gdbn1
parent: pqm at pqm.ubuntu.com-20090108195901-lechto0ubxsirqrd
parent: pqm at pqm.ubuntu.com-20090108205158-sez8mmopbhn2xkr5
committer: Karl Fogel <kfogel at red-bean.com>
branch nick: bzr.dev-trunk
timestamp: Thu 2009-01-08 16:05:52 -0500
message:
Merge from mainline.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
------------------------------------------------------------
revno: 3990.2.2
revision-id: pqm at pqm.ubuntu.com-20090210001553-5qi19ufmh3sx18mq
parent: pqm at pqm.ubuntu.com-20090209232557-ll08rw7c9xe43dpe
parent: ian.clatworthy at canonical.com-20090209233358-87e0072zgnkomb6v
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-02-10 00:15:53 +0000
message:
Command for opening Launchpad pages (Jonathan Lange)
added:
bzrlib/plugins/launchpad/test_lp_open.py test_lp_open.py-20090125174355-hxrsxh3sj84225qu-1
modified:
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
------------------------------------------------------------
revno: 3990.3.1
revision-id: ian.clatworthy at canonical.com-20090209233358-87e0072zgnkomb6v
parent: pqm at pqm.ubuntu.com-20090209232557-ll08rw7c9xe43dpe
parent: jml at canonical.com-20090125174401-tzky3d674jyo2odk
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Tue 2009-02-10 09:33:58 +1000
message:
Command for opening Launchpad pages (Jonathan Lange)
added:
bzrlib/plugins/launchpad/test_lp_open.py test_lp_open.py-20090125174355-hxrsxh3sj84225qu-1
modified:
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
------------------------------------------------------------
revno: 3955.3.10
revision-id: jml at canonical.com-20090125174401-tzky3d674jyo2odk
parent: jml at canonical.com-20090125174347-yfsnekjimnlsiy1l
committer: Jonathan Lange <jml at canonical.com>
branch nick: open-in-launchpad
timestamp: Sun 2009-01-25 15:44:01 -0200
message:
Blackbox tests, forgot to add these earlier.
added:
bzrlib/plugins/launchpad/test_lp_open.py test_lp_open.py-20090125174355-hxrsxh3sj84225qu-1
------------------------------------------------------------
revno: 3955.3.9
revision-id: jml at canonical.com-20090125174347-yfsnekjimnlsiy1l
parent: jml at canonical.com-20090125170734-0mpnb6ovwsd2wv00
committer: Jonathan Lange <jml at canonical.com>
branch nick: open-in-launchpad
timestamp: Sun 2009-01-25 15:43:47 -0200
message:
Catch errors.
modified:
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
------------------------------------------------------------
revno: 3955.3.8
revision-id: jml at canonical.com-20090125170734-0mpnb6ovwsd2wv00
parent: jml at canonical.com-20090124151018-5vygev25ufrjm25a
committer: Jonathan Lange <jml at canonical.com>
branch nick: open-in-launchpad
timestamp: Sun 2009-01-25 15:07:34 -0200
message:
Support lp URL shortcuts.
modified:
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
------------------------------------------------------------
revno: 3955.3.7
revision-id: jml at canonical.com-20090124151018-5vygev25ufrjm25a
parent: jml at canonical.com-20090124000001-l8ctacnsspxvnh42
committer: Jonathan Lange <jml at canonical.com>
branch nick: open-in-launchpad
timestamp: Sat 2009-01-24 13:10:18 -0200
message:
Test the launchpad-open command. Fix up some minor bugs.
modified:
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
------------------------------------------------------------
revno: 3955.3.6
revision-id: jml at canonical.com-20090124000001-l8ctacnsspxvnh42
parent: jml at canonical.com-20090123235918-qgxnw89348dhyjgo
committer: Jonathan Lange <jml at canonical.com>
branch nick: open-in-launchpad
timestamp: Fri 2009-01-23 22:00:01 -0200
message:
Add a TODO.
modified:
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
------------------------------------------------------------
revno: 3955.3.5
revision-id: jml at canonical.com-20090123235918-qgxnw89348dhyjgo
parent: jml at canonical.com-20090123233648-s3ufv7z20lss0k3t
committer: Jonathan Lange <jml at canonical.com>
branch nick: open-in-launchpad
timestamp: Fri 2009-01-23 21:59:18 -0200
message:
Add an untested plugin, make the error handling a little nicer.
modified:
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
------------------------------------------------------------
revno: 3955.3.4
revision-id: jml at canonical.com-20090123233648-s3ufv7z20lss0k3t
parent: jml at canonical.com-20090123232938-efhx2xe8swjkw5t7
committer: Jonathan Lange <jml at canonical.com>
branch nick: open-in-launchpad
timestamp: Fri 2009-01-23 21:36:48 -0200
message:
Some error cases, plus a docstring.
modified:
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
------------------------------------------------------------
revno: 3955.3.3
revision-id: jml at canonical.com-20090123232938-efhx2xe8swjkw5t7
parent: jml at canonical.com-20090123232743-xet3q9p8fux1csw1
committer: Jonathan Lange <jml at canonical.com>
branch nick: open-in-launchpad
timestamp: Fri 2009-01-23 21:29:38 -0200
message:
Test a couple more cases.
modified:
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
------------------------------------------------------------
revno: 3955.3.2
revision-id: jml at canonical.com-20090123232743-xet3q9p8fux1csw1
parent: jml at canonical.com-20090123232536-8itvi1bdejkd4gug
committer: Jonathan Lange <jml at canonical.com>
branch nick: open-in-launchpad
timestamp: Fri 2009-01-23 21:27:43 -0200
message:
Tighten up the code a little, changing the dev service to use https,
which a) works and b) is more realistic.
modified:
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
------------------------------------------------------------
revno: 3955.3.1
revision-id: jml at canonical.com-20090123232536-8itvi1bdejkd4gug
parent: pqm at pqm.ubuntu.com-20090123103145-yvo3icrif75vkt20
committer: Jonathan Lange <jml at canonical.com>
branch nick: open-in-launchpad
timestamp: Fri 2009-01-23 21:25:36 -0200
message:
Start doing URL stuff, extracting the domain bit out of LaunchpadService,
a little.
modified:
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
------------------------------------------------------------
revno: 3990.2.1
revision-id: pqm at pqm.ubuntu.com-20090209232557-ll08rw7c9xe43dpe
parent: pqm at pqm.ubuntu.com-20090209210810-cq9lgqy519b7wfyi
parent: ian.clatworthy at canonical.com-20090209223906-qb8p765bqtg61b2a
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-02-09 23:25:57 +0000
message:
rename 1.12-preview formats as development-wt5 (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
------------------------------------------------------------
revno: 3990.1.1
revision-id: ian.clatworthy at canonical.com-20090209223906-qb8p765bqtg61b2a
parent: pqm at pqm.ubuntu.com-20090209210810-cq9lgqy519b7wfyi
parent: ian.clatworthy at canonical.com-20090209063829-bv28wy5amxko8l1r
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Tue 2009-02-10 08:39:06 +1000
message:
rename 1.12-preview formats as development-wt5 (Ian Clatworthy)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
------------------------------------------------------------
revno: 3986.2.1
revision-id: ian.clatworthy at canonical.com-20090209063829-bv28wy5amxko8l1r
parent: pqm at pqm.ubuntu.com-20090209014051-5mj66o1vx58glvs9
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.dev-wt5
timestamp: Mon 2009-02-09 16:38:29 +1000
message:
rename 1.12-preview formats as development-wt5 formats
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
Diff too large for email (5224 lines, the limit is 1000).
More information about the bazaar-commits
mailing list