Rev 3829: Merge the latest brisbane-core. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/generic_fetch_ordering
John Arbash Meinel
john at arbash-meinel.com
Thu Feb 19 18:19:38 GMT 2009
At http://bzr.arbash-meinel.com/branches/bzr/brisbane/generic_fetch_ordering
------------------------------------------------------------
revno: 3829
revision-id: john at arbash-meinel.com-20090219181908-4u3mp535ah06iuj1
parent: john at arbash-meinel.com-20090219171317-o39ib282zbwyby8f
parent: john at arbash-meinel.com-20090219181831-dva2fu2d61hfndee
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: generic_fetch_ordering
timestamp: Thu 2009-02-19 12:19:08 -0600
message:
Merge the latest brisbane-core.
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/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/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/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
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/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_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_chk_map.py test_chk_map.py-20081001014447-ue6kkuhofvdecvxa-2
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-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_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
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/ui/text.py text.py-20051130153916-2e438cffc8afc478
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
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: 3821.1.12
revision-id: john at arbash-meinel.com-20090219181831-dva2fu2d61hfndee
parent: v.ladeuil+lp at free.fr-20090219161424-avq765vi1zi4n06e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: brisbane-core
timestamp: Thu 2009-02-19 12:18:31 -0600
message:
Change the generic fetch code to give better progress indication.
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 3821.1.11
revision-id: v.ladeuil+lp at free.fr-20090219161424-avq765vi1zi4n06e
parent: v.ladeuil+lp at free.fr-20090219161328-b0o4td220b09c26f
parent: pqm at pqm.ubuntu.com-20090219084345-0wx5gbw9v6hdmjmz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: brisbane-core
timestamp: Thu 2009-02-19 17:14:24 +0100
message:
Merge bzr.dev at 4020
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/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/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/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
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/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_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
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_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
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/ui/text.py text.py-20051130153916-2e438cffc8afc478
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
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: 3735.28.245
revision-id: pqm at pqm.ubuntu.com-20090219084345-0wx5gbw9v6hdmjmz
parent: pqm at pqm.ubuntu.com-20090218235203-20qxqit61rkfwa1r
parent: robertc at robertcollins.net-20090219080129-r1h5npnyybteaohk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-02-19 08:43:45 +0000
message:
(robertc) Create remote BzrDir objects using the existing bzr:// RPC
method when. (Robert Collins)
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3735.326.3
revision-id: robertc at robertcollins.net-20090219080129-r1h5npnyybteaohk
parent: robertc at robertcollins.net-20090219020654-1l19ged3zo7212jh
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2009-02-19 19:01:29 +1100
message:
Review feedback.
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 3735.326.2
revision-id: robertc at robertcollins.net-20090219020654-1l19ged3zo7212jh
parent: robertc at robertcollins.net-20090219014143-wv42sc7z71wbhht0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Thu 2009-02-19 13:06:54 +1100
message:
Perform creation of BzrDirMetaFormat1 control directories using an RPC where possible. (Robert Collins)
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3735.326.1
revision-id: robertc at robertcollins.net-20090219014143-wv42sc7z71wbhht0
parent: pqm at pqm.ubuntu.com-20090218132708-okubrahz9exvae9r
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push.roundtrips
timestamp: Thu 2009-02-19 12:41:43 +1100
message:
Add BzrDirFormatMeta1 test for the amount of rpc calls made initializing over the network.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3735.28.244
revision-id: pqm at pqm.ubuntu.com-20090218235203-20qxqit61rkfwa1r
parent: pqm at pqm.ubuntu.com-20090218212324-tz3ups4h8vg3j12t
parent: mbp at sourcefrog.net-20090218041504-1xlzucapzqwehryt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 23:52:03 +0000
message:
NEWS ReST syntax fix (mbp, trivial)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3735.325.1
revision-id: mbp at sourcefrog.net-20090218041504-1xlzucapzqwehryt
parent: pqm at pqm.ubuntu.com-20090218040347-uw2nm8ix8udwditt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Wed 2009-02-18 15:15:04 +1100
message:
Fix ReST syntax in NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3735.28.243
revision-id: pqm at pqm.ubuntu.com-20090218212324-tz3ups4h8vg3j12t
parent: pqm at pqm.ubuntu.com-20090218132708-okubrahz9exvae9r
parent: john at arbash-meinel.com-20090218160236-vjuspv4igqlijq7y
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-02-18 21:23:24 +0000
message:
(jam) Fix the new progress code to handle pb.tick() properly.
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 3735.324.1
revision-id: john at arbash-meinel.com-20090218160236-vjuspv4igqlijq7y
parent: pqm at pqm.ubuntu.com-20090218132708-okubrahz9exvae9r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: pb_tick
timestamp: Wed 2009-02-18 10:02:36 -0600
message:
Get a pb.tick() to work after calling pb.update()
Calling pb.tick() does an update with current_cnt = None.
This often is fine, as long as you haven't called update() before
with a total_count. Once total_count is set, then there were
code paths that didn't handle missing current_count.
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
------------------------------------------------------------
revno: 3735.28.242
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: 3735.323.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: 3735.323.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: 3735.323.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: 3735.28.241
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: 3735.322.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: 3735.322.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: 3735.322.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: 3735.322.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: 3735.322.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: 3735.322.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: 3735.28.240
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: 3735.321.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: 3735.321.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: 3735.320.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: 3735.320.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: 3735.320.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: 3735.320.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: 3735.28.239
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: 3735.319.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: 3735.319.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: 3735.319.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: 3735.319.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: 3735.28.238
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: 3735.318.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: 3735.318.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: 3735.318.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: 3735.28.237
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: 3735.317.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: 3735.317.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: 3735.317.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: 3735.28.236
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: 3735.314.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: 3735.316.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: 3735.316.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: 3735.316.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: 3735.316.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: 3735.316.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: 3735.316.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: 3735.316.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: 3735.316.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: 3735.316.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: 3735.316.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: 3735.316.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: 3735.315.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: 3735.315.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: 3735.315.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: 3735.315.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: 3735.315.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: 3735.315.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: 3735.315.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: 3735.315.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: 3735.315.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: 3735.315.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: 3735.315.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: 3735.315.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: 3735.315.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: 3735.315.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: 3735.28.235
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: 3735.314.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: 3735.313.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: 3735.313.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: 3735.28.234
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: 3735.312.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: 3735.28.233
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: 3735.311.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: 3735.311.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: 3735.311.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: 3735.311.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: 3735.311.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: 3735.28.232
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: 3735.303.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: 3735.310.2
tags: bzr-1.11
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: 3735.310.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: 3735.303.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: 3735.291.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: 3735.309.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: 3735.291.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: 3735.307.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: 3735.308.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: 3735.291.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: 3735.307.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: 3735.306.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: 3735.306.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: 3735.306.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: 3735.306.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: 3735.291.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: 3735.305.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: 3735.291.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: 3735.304.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: 3735.304.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: 3735.291.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: 3735.290.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: 3735.303.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: 3735.28.231
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: 3735.298.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: 3821.1.10
revision-id: v.ladeuil+lp at free.fr-20090219161328-b0o4td220b09c26f
parent: v.ladeuil+lp at free.fr-20090219153850-uuhb3eroqx5da0lr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: brisbane-core
timestamp: Thu 2009-02-19 17:13:28 +0100
message:
Fix test_repository.TestNewPack.test_new_instance_attributes erroring test.
modified:
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3821.1.9
revision-id: v.ladeuil+lp at free.fr-20090219153850-uuhb3eroqx5da0lr
parent: v.ladeuil+lp at free.fr-20090219153756-m5q7onkmlhsitoxn
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: brisbane-core
timestamp: Thu 2009-02-19 16:38:50 +0100
message:
Fix typos.
modified:
bzrlib/tests/test_chk_map.py test_chk_map.py-20081001014447-ue6kkuhofvdecvxa-2
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
------------------------------------------------------------
revno: 3821.1.8
revision-id: v.ladeuil+lp at free.fr-20090219153756-m5q7onkmlhsitoxn
parent: v.ladeuil+lp at free.fr-20090219143018-1hi72bu6xvuvolel
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: brisbane-core
timestamp: Thu 2009-02-19 16:37:56 +0100
message:
Make test_autopack_rpc_is_used_when_using_hpss raise KnowFailure for CHK repos.
* bzrlib/tests/test_pack_repository.py:
(TestSmartServerAutopack.test_autopack_rpc_is_used_when_using_hpss):
InterPackToRemotePack explicitely avoid using the autopack RPC,
let's try again once fetching has been improved.
modified:
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 3821.1.7
revision-id: v.ladeuil+lp at free.fr-20090219143018-1hi72bu6xvuvolel
parent: john at arbash-meinel.com-20090218190455-017wzogx5qzao31b
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: brisbane-core
timestamp: Thu 2009-02-19 15:30:18 +0100
message:
Finish cleaing up development3.
* bzrlib/tests/test_repository.py:
(TestDevelopment3): Deleted, there is no development3 format
anymore.
(TestDevelopment5FindRevisionOutsideSet.setUp): Ditto. Fix
erroring tests.
modified:
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
-------------- next part --------------
Diff too large for email (3392 lines, the limit is 1000).
More information about the bazaar-commits
mailing list