Rev 2788: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/commit
Robert Collins
robertc at robertcollins.net
Sun Sep 9 23:47:20 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/commit
------------------------------------------------------------
revno: 2788
revision-id: robertc at robertcollins.net-20070909224707-s1vrl45nvle0k51m
parent: robertc at robertcollins.net-20070906010906-2so4bg4lr3y8wlqd
parent: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Mon 2007-09-10 08:47:07 +1000
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2776.2.18.1.11
revision-id: pqm at pqm.ubuntu.com-20070907145828-hjh5941jv7y8d9z8
parent: pqm at pqm.ubuntu.com-20070906063814-iiwx3hccoukt499k
parent: v.ladeuil+lp at free.fr-20070907134117-hv955pzvsv3ofap9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-09-07 15:58:28 +0100
message:
Fix bug #137044: ftp password handling broken
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2776.2.18.1.10.1.1
revision-id: v.ladeuil+lp at free.fr-20070907134117-hv955pzvsv3ofap9
parent: pqm at pqm.ubuntu.com-20070906063814-iiwx3hccoukt499k
parent: v.ladeuil+lp at free.fr-20070907133303-0c0ro056pn6owz10
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.integration
timestamp: Fri 2007-09-07 15:41:17 +0200
message:
Fix bug #137044: ftp apssword handling broken
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2776.2.14.1.4
revision-id: v.ladeuil+lp at free.fr-20070907133303-0c0ro056pn6owz10
parent: v.ladeuil+lp at free.fr-20070905133820-s1jndkddykxebo4g
parent: pqm at pqm.ubuntu.com-20070906063814-iiwx3hccoukt499k
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 137044
timestamp: Fri 2007-09-07 15:33:03 +0200
message:
Merge bzr.dev
added:
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/benchmarks/bench_pack.py bench_pack.py-20070903042947-0wphp878xr6wkw7t-1
bzrlib/patiencediff.py patiencediff.py-20070721205536-jz8gaykeb7xtampk-1
renamed:
bzrlib/patiencediff.py => bzrlib/_patiencediff_py.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-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/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
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_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/workingtree_implementations/test_executable.py test_executable.py-20060628162557-tr7h57kl80l3ma8i-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/_patiencediff_py.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
------------------------------------------------------------
revno: 2776.2.14.1.3
revision-id: v.ladeuil+lp at free.fr-20070905133820-s1jndkddykxebo4g
parent: v.ladeuil+lp at free.fr-20070905133538-3hlcjti8pktcamp0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 137044
timestamp: Wed 2007-09-05 15:38:20 +0200
message:
Cosmetic change.
modified:
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2776.2.14.1.2
revision-id: v.ladeuil+lp at free.fr-20070905133538-3hlcjti8pktcamp0
parent: v.ladeuil+lp at free.fr-20070905072749-qiud9xt21loarqyy
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 137044
timestamp: Wed 2007-09-05 15:35:38 +0200
message:
Review feedback.
modified:
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2776.2.14.1.1
revision-id: v.ladeuil+lp at free.fr-20070905072749-qiud9xt21loarqyy
parent: pqm at pqm.ubuntu.com-20070903130729-qdcrag0a7vcpzfgm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 137044
timestamp: Wed 2007-09-05 09:27:49 +0200
message:
Fix #137044 by prompting for a password if *none* is provided for ftp.
* bzrlib/transport/ftp.py:
(FtpTransport._create_connection): The fix: the test was inverted.
(_setup_medusa.test_authorizer.__init__): One user can be secured
by verifying his password.
(_setup_medusa.test_authorizer.authorize): Check the password if a
secured user have been declared. Let the doors wide open
otherwise (as before :-/).
* bzrlib/tests/test_ftp_transport.py:
(TestFTPServer.test_basic_exists): New class for UI related tests.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2776.2.18.1.10
revision-id: pqm at pqm.ubuntu.com-20070906063814-iiwx3hccoukt499k
parent: pqm at pqm.ubuntu.com-20070906050530-q58gvki4dedc4i6e
parent: robertc at robertcollins.net-20070906055813-7gb0w5zi4u7xctt6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-09-06 07:38:14 +0100
message:
Fix typo in ghosts version of test_add_lines_nostoresha.
modified:
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
------------------------------------------------------------
revno: 2776.2.18.1.9.1.1
revision-id: robertc at robertcollins.net-20070906055813-7gb0w5zi4u7xctt6
parent: pqm at pqm.ubuntu.com-20070906050530-q58gvki4dedc4i6e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-09-06 15:58:13 +1000
message:
Fix typo in ghosts version of test_add_lines_nostoresha.
modified:
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
------------------------------------------------------------
revno: 2776.2.18.1.9
revision-id: pqm at pqm.ubuntu.com-20070906050530-q58gvki4dedc4i6e
parent: pqm at pqm.ubuntu.com-20070906043236-6mcj3cqvtl3i58t8
parent: robertc at robertcollins.net-20070906042055-r2fa1adv2nudrjjl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-09-06 06:05:30 +0100
message:
(robertc) Trivially remove spurious call in revisionstore.add_revision. (Robert Collins)
modified:
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
------------------------------------------------------------
revno: 2776.2.18.1.7.1.1
revision-id: robertc at robertcollins.net-20070906042055-r2fa1adv2nudrjjl
parent: pqm at pqm.ubuntu.com-20070906034124-gf4re7orinpud4to
parent: robertc at robertcollins.net-20070906014600-zsqflovlwhc52gpv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-09-06 14:20:55 +1000
message:
(robertc) Trivially remove spurious call in revisionstore.add_revision. (Robert Collins)
modified:
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
------------------------------------------------------------
revno: 2776.2.18.1.8
revision-id: pqm at pqm.ubuntu.com-20070906043236-6mcj3cqvtl3i58t8
parent: pqm at pqm.ubuntu.com-20070906034124-gf4re7orinpud4to
parent: ian.clatworthy at internode.on.net-20070906024154-mos66je5liigsj6v
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-09-06 05:32:36 +0100
message:
Document core developer tasks in HACKING
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2776.2.18.1.6.1.1
revision-id: ian.clatworthy at internode.on.net-20070906024154-mos66je5liigsj6v
parent: pqm at pqm.ubuntu.com-20070905084824-xdwd8f4fioovdi9v
parent: ian.clatworthy at internode.on.net-20070906023924-y3vylwher1ufxmgs
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Thu 2007-09-06 12:41:54 +1000
message:
Document core developer tasks in HACKING
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2776.2.18.1.3.1.2
revision-id: ian.clatworthy at internode.on.net-20070906023924-y3vylwher1ufxmgs
parent: ian.clatworthy at internode.on.net-20070905112549-86ehh7odw9ncloar
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.doc-core-devel
timestamp: Thu 2007-09-06 12:39:24 +1000
message:
Incorporate review feedback from poolie
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2776.2.18.1.3.1.1
revision-id: ian.clatworthy at internode.on.net-20070905112549-86ehh7odw9ncloar
parent: pqm at pqm.ubuntu.com-20070905051139-bogf0ne9pzsbsrs3
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.doc-core-devel
timestamp: Wed 2007-09-05 21:25:49 +1000
message:
Merge Core Developer Hanbook into HACKING
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2776.2.18.1.7
revision-id: pqm at pqm.ubuntu.com-20070906034124-gf4re7orinpud4to
parent: pqm at pqm.ubuntu.com-20070905084824-xdwd8f4fioovdi9v
parent: robertc at robertcollins.net-20070906014600-zsqflovlwhc52gpv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-09-06 04:41:24 +0100
message:
(robertc) Nuke VersionedFile add/get delta support which was never used, and reduce memory copies during commits of unannotated file such as inventory. (Robert Collins).
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 2776.2.21
revision-id: robertc at robertcollins.net-20070906014600-zsqflovlwhc52gpv
parent: robertc at robertcollins.net-20070905222501-n5nfbwd3rs21ll11
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Thu 2007-09-06 11:46:00 +1000
message:
Review feedback.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 2776.2.20
revision-id: robertc at robertcollins.net-20070905222501-n5nfbwd3rs21ll11
parent: robertc at robertcollins.net-20070905035159-6j1mh2gnrhpez5jp
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Thu 2007-09-06 08:25:01 +1000
message:
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
Diff too large for email (1634 lines, the limit is 1000).
More information about the bazaar-commits
mailing list