Rev 2627: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/knits
Robert Collins
robertc at robertcollins.net
Wed Jul 25 01:53:15 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/knits
------------------------------------------------------------
revno: 2627
revision-id: robertc at robertcollins.net-20070725005221-0ysm6il5mqnme3wz
parent: robertc at robertcollins.net-20070719063409-stu9sckrxp8wp3mo
parent: pqm at pqm.ubuntu.com-20070723214204-jwd5cwzvq93wwlgs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Wed 2007-07-25 10:52:21 +1000
message:
Merge bzr.dev.
removed:
bzrlib/bundle/common.py common.py-20050619223838-f25048f6638f04c6
bzrlib/bundle/old/ old-20051119041827-8f2417a9cc3b67f2
bzrlib/bundle/old/send_changeset.py send_changeset.py-20050628200204-9478d383946f1871
added:
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/email_message.py email_message.py-20070718143823-660zfcl54xi1v65u-1
bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/commands/ commands-20070518182516-v16lhwkl07jbj1k2-1
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
bzrlib/tests/commands/test_cat.py test_cat.py-20070525170351-vg2apsfb5j413913-1
bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
bzrlib/tests/commands/test_merge.py test_merge.py-20070525163813-v8yfs5wu77hjsx0o-1
bzrlib/tests/commands/test_missing.py test_missing.py-20070525171057-qr1z4sleurlp9b5v-1
bzrlib/tests/commands/test_pull.py test_pull.py-20070525144918-cgmunk4ici2krjnd-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_email_message.py test_email_message.p-20070718143823-660zfcl54xi1v65u-2
bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/transport/unlistable.py unlistable.py-20070714093417-5gc9d821to85zo4t-2
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
renamed:
bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
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/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-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_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_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_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
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
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2625.1.25
revision-id: pqm at pqm.ubuntu.com-20070723214204-jwd5cwzvq93wwlgs
parent: pqm at pqm.ubuntu.com-20070723155512-ckelzx8u6m5vxyja
parent: abentley at panoramicfeedback.com-20070723193715-2xkkwmr4l3bfb650
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-23 22:42:04 +0100
message:
bzr checkout -r always works, even with -r0 (#127708)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.60
revision-id: abentley at panoramicfeedback.com-20070723193715-2xkkwmr4l3bfb650
parent: abentley at panoramicfeedback.com-20070723145148-5e1357oxg0ndevw4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-07-23 15:37:15 -0400
message:
bzr checkout -r always works, even with -r0 (#127708)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
------------------------------------------------------------
revno: 2625.1.24
revision-id: pqm at pqm.ubuntu.com-20070723155512-ckelzx8u6m5vxyja
parent: pqm at pqm.ubuntu.com-20070723053815-oihay9qovs508r3k
parent: abentley at panoramicfeedback.com-20070723145148-5e1357oxg0ndevw4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-23 16:55:12 +0100
message:
Test that default behavior is as before
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.59
revision-id: abentley at panoramicfeedback.com-20070723145148-5e1357oxg0ndevw4
parent: abentley at panoramicfeedback.com-20070723142742-98ye8w4au9bjg5q0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-07-23 10:51:48 -0400
message:
Test that default behavior is as before
modified:
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.58
revision-id: abentley at panoramicfeedback.com-20070723142742-98ye8w4au9bjg5q0
parent: abentley at panoramicfeedback.com-20070723132749-9iwoipn261gqjml5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-07-23 10:27:42 -0400
message:
Status honours selected paths for conflicts (#127606)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.57
revision-id: abentley at panoramicfeedback.com-20070723132749-9iwoipn261gqjml5
parent: abentley at panoramicfeedback.com-20070720202707-x6qb9p0ib510s5x7
parent: pqm at pqm.ubuntu.com-20070723053815-oihay9qovs508r3k
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-07-23 09:27:49 -0400
message:
Merge bzr.dev
added:
bzrlib/tests/commands/ commands-20070518182516-v16lhwkl07jbj1k2-1
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
bzrlib/tests/commands/test_cat.py test_cat.py-20070525170351-vg2apsfb5j413913-1
bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
bzrlib/tests/commands/test_merge.py test_merge.py-20070525163813-v8yfs5wu77hjsx0o-1
bzrlib/tests/commands/test_missing.py test_missing.py-20070525171057-qr1z4sleurlp9b5v-1
bzrlib/tests/commands/test_pull.py test_pull.py-20070525144918-cgmunk4ici2krjnd-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2625.1.23
revision-id: pqm at pqm.ubuntu.com-20070723053815-oihay9qovs508r3k
parent: pqm at pqm.ubuntu.com-20070722185402-a7ib57fehfwd03jy
parent: ian.clatworthy at internode.on.net-20070723040130-z5yh5aj0g4zwqhnl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-23 06:38:15 +0100
message:
(Ian Clatworthy) Refactor commit to prepare for population by tree walking
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
------------------------------------------------------------
revno: 2625.1.22.1.1
revision-id: ian.clatworthy at internode.on.net-20070723040130-z5yh5aj0g4zwqhnl
parent: pqm at pqm.ubuntu.com-20070722185402-a7ib57fehfwd03jy
parent: ian.clatworthy at internode.on.net-20070723035711-a4y0zt5vvbaiuxty
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Mon 2007-07-23 14:01:30 +1000
message:
(Ian Clatworthy) Refactor commit to prepare for population by tree walking
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
------------------------------------------------------------
revno: 2564.2.7
revision-id: ian.clatworthy at internode.on.net-20070723035711-a4y0zt5vvbaiuxty
parent: ian.clatworthy at internode.on.net-20070718055129-u6tsvsqrd4pcuikw
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-prepare-populate-alternatives
timestamp: Mon 2007-07-23 13:57:11 +1000
message:
Clean-up comments and make use of self.builder.record_root_entry more explicit
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2564.2.6
revision-id: ian.clatworthy at internode.on.net-20070718055129-u6tsvsqrd4pcuikw
parent: ian.clatworthy at internode.on.net-20070713065436-5faa0xi6phxxvq1x
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-prepare-populate-alternatives
timestamp: Wed 2007-07-18 15:51:29 +1000
message:
Incorporate feedback from abentley
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2564.2.5
revision-id: ian.clatworthy at internode.on.net-20070713065436-5faa0xi6phxxvq1x
parent: ian.clatworthy at internode.on.net-20070713062245-m3ws7khi4jyhgbg3
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-prepare-populate-alternatives
timestamp: Fri 2007-07-13 16:54:36 +1000
message:
Fix NEWS to reflect merge into 0.19 instead of 0.18
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2564.2.4
revision-id: ian.clatworthy at internode.on.net-20070713062245-m3ws7khi4jyhgbg3
parent: ian.clatworthy at internode.on.net-20070713062159-kh1kde034wcrkygr
parent: pqm at pqm.ubuntu.com-20070713060449-rydsxz28x12l2ksm
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-prepare-populate-alternatives
timestamp: Fri 2007-07-13 16:22:45 +1000
message:
Merge bzr.dev
added:
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/_knit_load_data_py.py _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
bzrlib/benchmarks/bench_knit.py bench_knit.py-20070509145850-pan5jnd3hl7mfdya-1
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/tests/blackbox/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-1
bzrlib/tests/repository_implementations/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/workingtree_implementations/test_uncommit.py test_uncommit.py-20070712063057-8zaprw7t7lcqxeje-1
bzrlib/transport/brokenrename.py brokenrename.py-20070628050843-mbwebk50srn93rut-1
doc/developers/status.txt status.txt-20070702023117-6xss29lx170qndwr-1
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/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_add.py bench_add.py-20060516064526-6342399b2967266c
bzrlib/benchmarks/bench_bench.py bench_bench.py-20060609084943-2lv2wsi61vhkmj7b-1
bzrlib/benchmarks/bench_cache_utf8.py bench_encoding.py-20060810000746-nv69wfkxei7w2cij-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_inventory.py bench_inventory.py-20060611112709-gjo1kx0oudyo9qbv-1
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
bzrlib/benchmarks/bench_rocks.py bench_rocks.py-20060608120339-3ydxl3v2cori44zb-1
bzrlib/benchmarks/bench_sftp.py bench_sftp.py-20060810114659-67c1edb27503ebde
bzrlib/benchmarks/bench_startup.py bench_startup.py-20061006075337-q49on3zvfcbvarn3-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/benchmarks/bench_transform.py bench_transform.py-20060525041052-ysn0hlw94gcc57lm-1
bzrlib/benchmarks/bench_workingtree.py bench_workingtree.py-20060527061822-cxrgsa9ax2q4d82q-1
bzrlib/benchmarks/bench_xml.py bench_xml.py-20060816202544-ty0p415bb7om5gzd-1
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/generate_ids.py generate_ids.py-20061102205935-z3do15ipw6m7v26u-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/strace.py strace.py-20070323001526-6zquhhw8leb9m6j8-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_aliases.py test_aliases.py-20060210230318-f0c08c9294dbfae1
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
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_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_inventory.py test_inventory.py-20060921205529-9rwo2222xhm8edti-1
bzrlib/tests/blackbox/test_join.py test_join.py-20060928210902-95dkqa6boh8uq92b-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_lsprof.py test_lsprof.py-20070622025641-nbsm2svy8anvj9df-1
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_remerge.py test_remerge.py-20060629162739-o9m3s6143v8jnr2y-1
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_revno.py test_revno.py-20051204214528-2f0bf83a71b7656a
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_testament.py test_testament.py-20060816161839-snq405g3jk15gpax-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/blackbox/test_whoami.py test_whoami.py-20060629025641-8h3m2ch7kutqx7ug-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_strace.py test_strace.py-20070323001526-6zquhhw8leb9m6j8-2
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 2564.2.3
revision-id: ian.clatworthy at internode.on.net-20070713062159-kh1kde034wcrkygr
parent: ian.clatworthy at internode.on.net-20070713053639-m9c55376prkqzq3w
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-prepare-populate-alternatives
timestamp: Fri 2007-07-13 16:21:59 +1000
message:
more abentley feedback: use get_nested_tree and include file_id
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2564.2.2
revision-id: ian.clatworthy at internode.on.net-20070713053639-m9c55376prkqzq3w
parent: ian.clatworthy at internode.on.net-20070629043501-zgm70dyx6ut3yerk
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-prepare-populate-alternatives
timestamp: Fri 2007-07-13 15:36:39 +1000
message:
incorporate feedback from abentley
modified:
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
------------------------------------------------------------
revno: 2564.2.1
revision-id: ian.clatworthy at internode.on.net-20070629043501-zgm70dyx6ut3yerk
parent: pqm at pqm.ubuntu.com-20070629000000-dmkdjthna7njsccg
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.commit-prepare-populate-alternatives
timestamp: Fri 2007-06-29 14:35:01 +1000
message:
refactor commit to support alternative population meothds
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
------------------------------------------------------------
revno: 2625.1.22
revision-id: pqm at pqm.ubuntu.com-20070722185402-a7ib57fehfwd03jy
parent: pqm at pqm.ubuntu.com-20070722180904-wy7y7oyi32wbghgf
parent: aaron.bentley at utoronto.ca-20070722173807-mh2prixtof3274ng
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-07-22 19:54:02 +0100
message:
Fix deprecation warnings on benchmarks (Lukas Lalinsky)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
------------------------------------------------------------
revno: 2625.1.20.1.2
revision-id: aaron.bentley at utoronto.ca-20070722173807-mh2prixtof3274ng
parent: aaron.bentley at utoronto.ca-20070722173622-1p4mw28bzp1qangs
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sun 2007-07-22 13:38:07 -0400
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2625.1.20.1.1
revision-id: aaron.bentley at utoronto.ca-20070722173622-1p4mw28bzp1qangs
parent: pqm at pqm.ubuntu.com-20070721163603-p17kh2wgzkhbef1d
parent: lalinsky at gmail.com-20070722120819-txzu81te3zc2m72v
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sun 2007-07-22 13:36:22 -0400
message:
Fix deprecation warnings on benchmarks (Lukáš Lalinský)
modified:
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
------------------------------------------------------------
revno: 2625.1.19.2.1
revision-id: lalinsky at gmail.com-20070722120819-txzu81te3zc2m72v
parent: pqm at pqm.ubuntu.com-20070720233740-hjfxo6dx2ytwkros
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: bzr.benchmarks
timestamp: Sun 2007-07-22 14:08:19 +0200
message:
Fix deprecation warnings on benchmarks.
modified:
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
------------------------------------------------------------
revno: 2625.1.21
revision-id: pqm at pqm.ubuntu.com-20070722180904-wy7y7oyi32wbghgf
parent: pqm at pqm.ubuntu.com-20070721163603-p17kh2wgzkhbef1d
parent: v.ladeuil+lp at free.fr-20070722171918-7pt18yku39667dzy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-07-22 19:09:04 +0100
message:
Transport connection sharing
added:
bzrlib/tests/commands/ commands-20070518182516-v16lhwkl07jbj1k2-1
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
bzrlib/tests/commands/test_cat.py test_cat.py-20070525170351-vg2apsfb5j413913-1
bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
bzrlib/tests/commands/test_merge.py test_merge.py-20070525163813-v8yfs5wu77hjsx0o-1
bzrlib/tests/commands/test_missing.py test_missing.py-20070525171057-qr1z4sleurlp9b5v-1
bzrlib/tests/commands/test_pull.py test_pull.py-20070525144918-cgmunk4ici2krjnd-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2485.8.63
revision-id: v.ladeuil+lp at free.fr-20070722171918-7pt18yku39667dzy
parent: v.ladeuil+lp at free.fr-20070722171805-u050omkduhfxijy0
parent: pqm at pqm.ubuntu.com-20070721163603-p17kh2wgzkhbef1d
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Sun 2007-07-22 19:19:18 +0200
message:
merge bzr.dev at 2645
added:
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2485.8.62
revision-id: v.ladeuil+lp at free.fr-20070722171805-u050omkduhfxijy0
parent: v.ladeuil+lp at free.fr-20070722154459-520ws2gnifghkpgy
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Sun 2007-07-22 19:18:05 +0200
message:
From review comments, fix typos and deprecate some functions.
* bzrlib/transport/__init__.py:
(urlescape, urlunescape): Deprecated.
modified:
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/commands/test_cat.py test_cat.py-20070525170351-vg2apsfb5j413913-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2485.8.61
revision-id: v.ladeuil+lp at free.fr-20070722154459-520ws2gnifghkpgy
parent: v.ladeuil+lp at free.fr-20070720185929-lg19h2k1lfomgtxa
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Sun 2007-07-22 17:44:59 +0200
message:
From review comments, use a private scheme for testing.
* bzrlib/transport/__init__.py:
(_unregister_urlparse_netloc_protocol): New function.
* bzrlib/tests/transport_util.py:
(InstrumentedTransport.__init__): Use a dedicated scheme.
(TestCaseWithConnectionHookedTransport.setUp): Reworked to
register the new transport.
(TestCaseWithConnectionHookedTransport.get_url): Use our dedicated
scheme.
(TestCaseWithConnectionHookedTransport.install_hooks,
TestCaseWithConnectionHookedTransport.reset_hooks): Registering
transport is setUp job.
modified:
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2485.8.60
revision-id: v.ladeuil+lp at free.fr-20070720185929-lg19h2k1lfomgtxa
parent: v.ladeuil+lp at free.fr-20070720165741-a15p58sjtdm8qd6i
parent: pqm at pqm.ubuntu.com-20070720161548-nppg3mvd38gbuaid
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Fri 2007-07-20 20:59:29 +0200
message:
merge bzr.dev at 2642
removed:
bzrlib/bundle/common.py common.py-20050619223838-f25048f6638f04c6
bzrlib/bundle/old/ old-20051119041827-8f2417a9cc3b67f2
bzrlib/bundle/old/send_changeset.py send_changeset.py-20050628200204-9478d383946f1871
added:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/email_message.py email_message.py-20070718143823-660zfcl54xi1v65u-1
bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/test_email_message.py test_email_message.p-20070718143823-660zfcl54xi1v65u-2
bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
bzrlib/transport/unlistable.py unlistable.py-20070714093417-5gc9d821to85zo4t-2
bzrlib/util/tests/ bzrlibutiltests-20070713054332-wmm62qs3xvyfzwup-1
bzrlib/util/tests/__init__.py __init__.py-20070713054446-oliu3oth0gy08y0t-1
bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
doc/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
doc/developers/diff.txt diff.txt-20070716233605-2q6jzorua7mr42jk-1
doc/developers/indices.txt indices.txt-20070713142939-m5cdnp31u8ape0td-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
renamed:
bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
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/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-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
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/capture_tree.py capture_tree.py-20051004100938-c7ff053182f5ae51
tools/rst2prettyhtml.py rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
tools/trace-revisions tracerevisions-20051107162041-9dfee0a7324d206d
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2485.8.59
revision-id: v.ladeuil+lp at free.fr-20070720165741-a15p58sjtdm8qd6i
parent: v.ladeuil+lp at free.fr-20070715112418-9nn4n6esxv60ny4b
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Fri 2007-07-20 18:57:41 +0200
message:
Update from review comments.
* bzrlib/tests/blackbox/test_branch.py:
(TestRemoteBranch): New class ensuring that working trees are not
created remotely.
* bzrlib/transport/sftp.py:
(SFTPTransport.__init__): Make from_transport parameter private.
* bzrlib/transport/remote.py:
(RemoteTransport.__init__): Make from_transport parameter private.
(RemoteHTTPTransport.__init__): Make from_transport parameter private.
(RemoteHTTPTransport.clone): Use _from_transport as a keyword
parameter.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): Make from_transport parameter private.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport.__init__): Make from_transport parameter private.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase.__init__): Make from_transport parameter private.
* bzrlib/transport/ftp.py:
(FtpTransport.__init__): Make from_transport parameter private.
* bzrlib/transport/__init__.py:
(ConnectedTransport.__init__): Make from_transport parameter private.
(ConnectedTransport.clone, ConnectedTransport._reuse_for): Use
_from_transport as a keyword parameter.
* bzrlib/tests/commands/test_push.py:
(TestPush.test_push): Don't add self.reset_hooks to cleanup,
install_hooks did it.
* bzrlib/tests/commands/test_pull.py:
(TestPull.test_pull): Don't add self.reset_hooks to cleanup,
install_hooks did it.
* bzrlib/tests/commands/test_missing.py:
(TestMissing.test_missing): Don't add self.reset_hooks to cleanup,
install_hooks did it.
* bzrlib/tests/commands/test_merge.py:
(TestMerge.test_merge): Don't add self.reset_hooks to cleanup,
install_hooks did it.
* bzrlib/tests/commands/test_init_repository.py:
(TestInitRepository.setUp): Don't add self.reset_hooks to cleanup,
install_hooks did it.
* bzrlib/tests/commands/test_init.py:
(TestInit.setUp): Don't add self.reset_hooks to cleanup, install_hooks
did it.
* bzrlib/tests/commands/test_checkout.py:
(TestCheckout.test_checkout): Don't add self.reset_hooks to cleanup,
install_hooks did it.
* bzrlib/tests/commands/test_cat.py:
(TestCat.test_cat): Don't add self.reset_hooks to cleanup,
install_hooks did it. Skip the test until sftp transport/server problem
is fixed.
* bzrlib/tests/commands/test_branch.py:
(TestBranch.setUp): Don't add self.reset_hooks to cleanup,
install_hooks did it.
* bzrlib/builtins.py:
(_get_bundle_helper): New function. Factored out from merge and pull.
(cmd_pull.run, cmd_merge.run): Use _get_bundle_helper.
(_merge_helper): Add possible_transports as the last parameter.
* bzrlib/tests/transport_util.py:
Renamed from bzrlib/tests/TransportUtil.py. Switch from ftp to sftp
transport and server.
renamed:
bzrlib/tests/TransportUtil.py => bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
bzrlib/tests/commands/test_cat.py test_cat.py-20070525170351-vg2apsfb5j413913-1
bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
bzrlib/tests/commands/test_merge.py test_merge.py-20070525163813-v8yfs5wu77hjsx0o-1
bzrlib/tests/commands/test_missing.py test_missing.py-20070525171057-qr1z4sleurlp9b5v-1
bzrlib/tests/commands/test_pull.py test_pull.py-20070525144918-cgmunk4ici2krjnd-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
------------------------------------------------------------
revno: 2485.8.58
revision-id: v.ladeuil+lp at free.fr-20070715112418-9nn4n6esxv60ny4b
parent: v.ladeuil+lp at free.fr-20070715111719-uybjoupp5yhm57ce
parent: pqm at pqm.ubuntu.com-20070713074627-93zxs9uh528y0fki
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Sun 2007-07-15 13:24:18 +0200
message:
merge bzr.dev at 1617
added:
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/_knit_load_data_py.py _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
bzrlib/benchmarks/bench_knit.py bench_knit.py-20070509145850-pan5jnd3hl7mfdya-1
bzrlib/tests/blackbox/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-1
bzrlib/tests/repository_implementations/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
bzrlib/tests/workingtree_implementations/test_uncommit.py test_uncommit.py-20070712063057-8zaprw7t7lcqxeje-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2485.8.57
revision-id: v.ladeuil+lp at free.fr-20070715111719-uybjoupp5yhm57ce
parent: v.ladeuil+lp at free.fr-20070715104412-ghj18yhkvjwpd54b
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Sun 2007-07-15 13:17:19 +0200
message:
Cosmetic changes.
modified:
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/commands/test_cat.py test_cat.py-20070525170351-vg2apsfb5j413913-1
bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
bzrlib/tests/commands/test_merge.py test_merge.py-20070525163813-v8yfs5wu77hjsx0o-1
bzrlib/tests/commands/test_missing.py test_missing.py-20070525171057-qr1z4sleurlp9b5v-1
bzrlib/tests/commands/test_pull.py test_pull.py-20070525144918-cgmunk4ici2krjnd-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
------------------------------------------------------------
revno: 2485.8.56
revision-id: v.ladeuil+lp at free.fr-20070715104412-ghj18yhkvjwpd54b
parent: v.ladeuil+lp at free.fr-20070714152237-7ay6ua7lvf5n876r
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Sun 2007-07-15 12:44:12 +0200
message:
Fix bug #112173 and bzr branch multiple connections.
* bzrlib/tests/bzrdir_implementations/test_bzrdir.py:
(TestBzrDir.sproutOrSkip): Rework the method now that sprout do
not raises NotLocalUrl anymore.
* bzrlib/bzrdir.py:
(BzrDir.sprout): Add a possible_transports parameter for reuse.
Don't create a working tree on non local transports (bug #112173).
(BzrDirPreSplitOut.sprout): Add a possible_transports
parameter (not used) to comply with the new sprout signature.
* bzrlib/builtins.py:
(cmd_branch.run): Fix the multiple connections bug by reusing the
transport.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/TransportUtil.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
------------------------------------------------------------
revno: 2485.8.55
revision-id: v.ladeuil+lp at free.fr-20070714152237-7ay6ua7lvf5n876r
parent: v.ladeuil+lp at free.fr-20070714135520-y2310bi8fzclx410
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Sat 2007-07-14 17:22:37 +0200
message:
Cleanup connection accessors.
* bzrlib/transport/remote.py:
(RemoteTransport.__init__): Use _SharedConnection.
* bzrlib/transport/__init__.py:
(_SharedConnection): New container class for connections. Avoid
some uglyness in the accessors.
(ConnectedTransport.__init__): Use _SharedConnection.
(ConnectedTransport._set_shared_connection): Deleted.
(ConnectedTransport._set_connection,
ConnectedTransport._get_connection,
ConnectedTransport._get_credentials,
ConnectedTransport._update_credentials): Cleanup.
modified:
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 2485.8.54
revision-id: v.ladeuil+lp at free.fr-20070714135520-y2310bi8fzclx410
parent: v.ladeuil+lp at free.fr-20070713100223-g8a01alb47mxfrio
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Sat 2007-07-14 15:55:20 +0200
message:
Refactor medium uses by making a distinction betweem shared and real medium.
* bzrlib/transport/remote.py:
(RemoteTransport.__init__): Rework the medium building.
(RemoteTransport.get_shared_medium): Give access to the shared
connection.
(RemoteTransport.get_bytes, RemoteTransport.readv,
RemoteTransport.disconnect): Use the real medium.
(RemoteTCPTransport._build_medium): Simplified.
(RemoteSSHTransport._build_medium): Simplified.
(RemoteHTTPTransport): Simplified.
* bzrlib/transport/__init__.py:
(Transport.get_shared_medium): Mimick get_smart_medium but
provides access to the shared medium.
(ConnectedTransport.__init__): Rename connection_sharing to
shared_connection as it bettre fits the use by smart stransports.
(ConnectedTransport._set_shared_connection,
ConnectedTransport._get_shared_connection): New accessors.
(ConnectedTransport._set_connection,
ConnectedTransport._get_connection,
ConnectedTransport._get_credentials,
ConnectedTransport._update_credentials): Use the new accessors.
* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_connection_sharing): Adapt the test as smart
transports have a connection even before the first request.
* bzrlib/tests/test_smart_transport.py:
(WritableEndToEndTests.test_simple_clone_conn): Use the real medium.
* bzrlib/smart/client.py:
(_SmartClient): Build from a shared medium.
(_SmartClient.get_smart_medium): Provides access to the real
medium.
(_SmartClient.call_expecting_body,
_SmartClient.call_with_body_bytes): Use the real medium.
* bzrlib/remote.py:
(RemoteBzrDir.__init__, RemoteRepository.__init__,
RemoteBranch.__init__): Use the shared medium to build the smart
client.
* bzrlib/bzrdir.py:
(RemoteBzrDirFormat.initialize_on_transport): Use the shared
medium to build the smart client.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 2485.8.53
revision-id: v.ladeuil+lp at free.fr-20070713100223-g8a01alb47mxfrio
parent: v.ladeuil+lp at free.fr-20070713095933-ej6wrg0m57qm0a5u
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Fri 2007-07-13 12:02:23 +0200
message:
Apply test_connection_sharing to all transports to make smart
transports fail the test.
* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_connection_sharing): Moved and updated from
test_transport.py.
* bzrlib/tests/test_transport.py:
(TestConnectedTransport.test_connection_sharing): Moved to
test_transport_implementations.py.
modified:
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
------------------------------------------------------------
revno: 2485.8.52
revision-id: v.ladeuil+lp at free.fr-20070713095933-ej6wrg0m57qm0a5u
parent: v.ladeuil+lp at free.fr-20070712082209-z67t7qlthtrtvm7l
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Fri 2007-07-13 11:59:33 +0200
message:
Update deprecation version.
modified:
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2485.8.51
revision-id: v.ladeuil+lp at free.fr-20070712082209-z67t7qlthtrtvm7l
parent: v.ladeuil+lp at free.fr-20070704122856-7jn5e6ou08ukimof
parent: pqm at pqm.ubuntu.com-20070712075207-pgz7ur4rxmklmrxr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Thu 2007-07-12 10:22:09 +0200
message:
merge bzr.dev @ 2604
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/strace.py strace.py-20070323001526-6zquhhw8leb9m6j8-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_aliases.py test_aliases.py-20060210230318-f0c08c9294dbfae1
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
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_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_inventory.py test_inventory.py-20060921205529-9rwo2222xhm8edti-1
bzrlib/tests/blackbox/test_join.py test_join.py-20060928210902-95dkqa6boh8uq92b-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_lsprof.py test_lsprof.py-20070622025641-nbsm2svy8anvj9df-1
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_remerge.py test_remerge.py-20060629162739-o9m3s6143v8jnr2y-1
bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_revno.py test_revno.py-20051204214528-2f0bf83a71b7656a
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_testament.py test_testament.py-20060816161839-snq405g3jk15gpax-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/blackbox/test_whoami.py test_whoami.py-20060629025641-8h3m2ch7kutqx7ug-1
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_strace.py test_strace.py-20070323001526-6zquhhw8leb9m6j8-2
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
------------------------------------------------------------
revno: 2485.8.50
revision-id: v.ladeuil+lp at free.fr-20070704122856-7jn5e6ou08ukimof
parent: v.ladeuil+lp at free.fr-20070629144004-6qwwujm20j1zsi58
parent: pqm at pqm.ubuntu.com-20070704095320-41p0gvstimqqzvtx
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Wed 2007-07-04 14:28:56 +0200
message:
merge bzr.dev @ 2584 resolving conflicts
added:
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/transport/brokenrename.py brokenrename.py-20070628050843-mbwebk50srn93rut-1
doc/developers/status.txt status.txt-20070702023117-6xss29lx170qndwr-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_add.py bench_add.py-20060516064526-6342399b2967266c
bzrlib/benchmarks/bench_bench.py bench_bench.py-20060609084943-2lv2wsi61vhkmj7b-1
bzrlib/benchmarks/bench_cache_utf8.py bench_encoding.py-20060810000746-nv69wfkxei7w2cij-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_inventory.py bench_inventory.py-20060611112709-gjo1kx0oudyo9qbv-1
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
bzrlib/benchmarks/bench_rocks.py bench_rocks.py-20060608120339-3ydxl3v2cori44zb-1
bzrlib/benchmarks/bench_sftp.py bench_sftp.py-20060810114659-67c1edb27503ebde
bzrlib/benchmarks/bench_startup.py bench_startup.py-20061006075337-q49on3zvfcbvarn3-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/benchmarks/bench_transform.py bench_transform.py-20060525041052-ysn0hlw94gcc57lm-1
bzrlib/benchmarks/bench_workingtree.py bench_workingtree.py-20060527061822-cxrgsa9ax2q4d82q-1
bzrlib/benchmarks/bench_xml.py bench_xml.py-20060816202544-ty0p415bb7om5gzd-1
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
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/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/generate_ids.py generate_ids.py-20061102205935-z3do15ipw6m7v26u-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
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_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 2485.8.49
revision-id: v.ladeuil+lp at free.fr-20070629144004-6qwwujm20j1zsi58
parent: v.ladeuil+lp at free.fr-20070620142506-txsb1v8538kpsafw
parent: pqm at pqm.ubuntu.com-20070629060700-wou1v3btg9otmum4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Fri 2007-06-29 16:40:04 +0200
message:
nzrge bzr.dev at 2565
added:
bzrlib/api.py api.py-20070626082640-35lspz7j0ys7a8ld-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/tests/blackbox/test_lsprof.py test_lsprof.py-20070622025641-nbsm2svy8anvj9df-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/dirstate.txt dirstate.txt-20070618020404-cdhv0ecgrukomemg-2
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
doc/developers/uncommit.txt uncommit.txt-20070621042721-4clw8ucb9u9yda2h-1
renamed:
doc/developers/performance-commit.txt => doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
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_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
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_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_api.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
------------------------------------------------------------
revno: 2485.8.48
revision-id: v.ladeuil+lp at free.fr-20070620142506-txsb1v8538kpsafw
parent: v.ladeuil+lp at free.fr-20070611073743-eqmrwxje32agbzpx
parent: pqm at pqm.ubuntu.com-20070620092141-cniojlk01bdec2a1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Wed 2007-06-20 16:25:06 +0200
message:
merge bzr.dev @ 2540
added:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
doc/developers/planned-change-integration.txt plannedchangeintegra-20070619004702-i1b3ccamjtfaoq6w-1
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
renamed:
bzrlib/graph.py => bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/tests/test_graph.py => bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
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/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
------------------------------------------------------------
revno: 2485.8.47
revision-id: v.ladeuil+lp at free.fr-20070611073743-eqmrwxje32agbzpx
parent: v.ladeuil+lp at free.fr-20070611071017-0e6xt2o4e1y75195
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Mon 2007-06-11 09:37:43 +0200
message:
Remove _initial_split_url hack.
* bzrlib/transport/__init__.py:
(ConnectedTransport.__init__): Use _split_url.
(ConnectedTransport._split_url): Really a static method.
(ConnectedTransport._unsplit_url): Really a static method.
* bzrlib/transport/remote.py:
(RemoteTCPTransport.__init__): Set default port. Doing so in
__init__ is perfectly valid and cleaner than the
_initial_split_url hack.
modified:
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 2485.8.46
revision-id: v.ladeuil+lp at free.fr-20070611071017-0e6xt2o4e1y75195
parent: v.ladeuil+lp at free.fr-20070610110956-n2xuhc39romr4aju
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Mon 2007-06-11 09:10:17 +0200
message:
Add some remarks about current limitations in connection sharing.
modified:
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 2485.8.45
revision-id: v.ladeuil+lp at free.fr-20070610110956-n2xuhc39romr4aju
parent: v.ladeuil+lp at free.fr-20070610110710-2xi9ditvln347qpj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Sun 2007-06-10 13:09:56 +0200
message:
Take jam's remarks into account.
* bzrlib/transport/__init__.py:
(ConnectedTransport._get_credentials): Delete dead code.
* bzrlib/bzrdir.py:
(BzrDir.create, BzrDir.create_branch_convenience,
BzrDir.create_standalone_workingtree): Following jam's remark,
delete safe_unicode protection.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2485.8.44
revision-id: v.ladeuil+lp at free.fr-20070610110710-2xi9ditvln347qpj
parent: v.ladeuil+lp at free.fr-20070608121205-3yf92bbzzca9tgpm
parent: v.ladeuil+lp at free.fr-20070608162657-5ohy71agv39clh1h
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Sun 2007-06-10 13:07:10 +0200
message:
merge after bzr bind (why did I have to do that ?)
added:
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
doc/developers/add.txt add.txt-20070515094933-xhgz3xjc7o0edok0-2
doc/developers/annotate.txt annotate.txt-20070515142136-rq51c4kqhwrjsh8k-1
doc/developers/bundle-creation.txt bundlecreation.rst-20070527173558-rqaqxn1al7vzgcto-1
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
doc/developers/gc.txt gc.txt-20070515102609-90x5kzjokrurfbke-1
doc/developers/initial-push-pull.txt initialpushpull.rst-20070527184539-wodba32mi5dehhct-1
doc/developers/merge-scaling.txt mergescaling.rst-20070527173558-rqaqxn1al7vzgcto-2
doc/developers/performance-commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
doc/developers/revert.txt revert.txt-20070515111013-grc9hgp21zxqbwbl-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
contrib/bash/bzr.simple bzr-20050503074841-dfc41af1e02111f9
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/incremental-push-pull.txt incrementalpushpull.-20070508045640-zneiu1yzbci574c6-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap-rationale.txt performanceroadmapra-20070507174912-mwv3xv517cs4sisd-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
doc/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2485.8.43.1.2
revision-id: v.ladeuil+lp at free.fr-20070608162657-5ohy71agv39clh1h
parent: v.ladeuil+lp at free.fr-20070608160750-pr023mg4apgxb2us
parent: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Fri 2007-06-08 18:26:57 +0200
message:
merge bzr.dev at 2520
added:
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
doc/developers/add.txt add.txt-20070515094933-xhgz3xjc7o0edok0-2
doc/developers/annotate.txt annotate.txt-20070515142136-rq51c4kqhwrjsh8k-1
doc/developers/bundle-creation.txt bundlecreation.rst-20070527173558-rqaqxn1al7vzgcto-1
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
doc/developers/gc.txt gc.txt-20070515102609-90x5kzjokrurfbke-1
doc/developers/initial-push-pull.txt initialpushpull.rst-20070527184539-wodba32mi5dehhct-1
doc/developers/merge-scaling.txt mergescaling.rst-20070527173558-rqaqxn1al7vzgcto-2
doc/developers/performance-commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
doc/developers/revert.txt revert.txt-20070515111013-grc9hgp21zxqbwbl-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
contrib/bash/bzr.simple bzr-20050503074841-dfc41af1e02111f9
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/incremental-push-pull.txt incrementalpushpull.-20070508045640-zneiu1yzbci574c6-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap-rationale.txt performanceroadmapra-20070507174912-mwv3xv517cs4sisd-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
doc/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2485.8.43.1.1
revision-id: v.ladeuil+lp at free.fr-20070608160750-pr023mg4apgxb2us
parent: v.ladeuil+lp at free.fr-20070608121205-3yf92bbzzca9tgpm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Fri 2007-06-08 18:07:50 +0200
message:
Explain that we share connection and credentials (from
jam-back-to-the-future remarks preceding review).
* bzrlib/transport/__init__.py:
(ConnectedTransport): Rename _connection to _connection_sharing to
undelrline the fact that we share the connection *and* the
associated credentials.
modified:
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2485.8.43
revision-id: v.ladeuil+lp at free.fr-20070608121205-3yf92bbzzca9tgpm
parent: v.ladeuil+lp at free.fr-20070608085227-dkwzu18gxemnwwha
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Fri 2007-06-08 14:12:05 +0200
message:
Cleaning.
modified:
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 2485.8.42
revision-id: v.ladeuil+lp at free.fr-20070608085227-dkwzu18gxemnwwha
parent: v.ladeuil+lp at free.fr-20070607113627-2fudc24suivry84k
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Fri 2007-06-08 10:52:27 +0200
message:
Finish (almost) remote refactoring. Test suite passing.
* bzrlib/transport/remote.py:
(RemoteTransport.__init__): Refactoring of connection
sharing. This is incomplete if we want to achieve connction
sharing across reconnections but enough to make the test suite
pass.
(RemoteTransport.clone): Deleted.
(RemoteTransport._build_medium): Default implementation (mainly
used for tests).
(RemoteTransport.get_smart_client,
RemoteTransport.get_smart_medium): Give back the shared medium
instead of the private one. This is incomplete but a step in the
right direction.
(RemoteTCPTransport._build_medium,
RemoteHTTPTransport._build_medium): Create and set the connection
if not cloning.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 2485.8.41
revision-id: v.ladeuil+lp at free.fr-20070607113627-2fudc24suivry84k
parent: v.ladeuil+lp at free.fr-20070607112936-xkiqdgbkjibjjkh6
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Thu 2007-06-07 13:36:27 +0200
message:
Finish http refactoring. Test suite passing.
* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): Simplified.
(HttpTransport_urllib._remote_path): New method. Get rid of
authinfo only for urllib2 purposes.
(HttpTransport_urllib._perform): Rewrite the connection sync
between transport and request.
(HttpTransport_urllib._get, HttpTransport_urllib._get,
HttpTransport_urllib._post): Updated for the new connection handling.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport.__init__): Simplified.
(PyCurlTransport._get_curl): New method.
(PyCurlTransport.has, PyCurlTransport._get_full)
(PyCurlTransport._get_ranged, PyCurlTransport._post): Use _get_curl().
modified:
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
------------------------------------------------------------
revno: 2485.8.40
revision-id: v.ladeuil+lp at free.fr-20070607112936-xkiqdgbkjibjjkh6
parent: v.ladeuil+lp at free.fr-20070607112203-2c3190a3ppqg9c6m
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Thu 2007-06-07 13:29:36 +0200
message:
Fix typo.
modified:
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
------------------------------------------------------------
revno: 2485.8.39
revision-id: v.ladeuil+lp at free.fr-20070607112203-2c3190a3ppqg9c6m
parent: v.ladeuil+lp at free.fr-20070606142608-i9ufaqewadslf1cn
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Thu 2007-06-07 13:22:03 +0200
message:
Add tests around connection reuse.
* bzrlib/transport/__init__.py:
(ConnectedTransport._update_credentials): New method for
transports that can authenticate again while keeping the
connection alive.
* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test__reuse_for,
TransportTests.test_reuse_connection_for_various_paths): More
tests for _reuse_for.
* bzrlib/tests/test_transport.py:
(TestConnectedTransport.test_connection_sharing_propagate_credentials):
Add test for _update_credentials.
(TestReusedTransports.test_reuse_same_transport): More tests.
modified:
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2485.8.38
revision-id: v.ladeuil+lp at free.fr-20070606142608-i9ufaqewadslf1cn
parent: v.ladeuil+lp at free.fr-20070606135202-mqhxcv6z57uce434
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Wed 2007-06-06 16:26:08 +0200
message:
Finish sftp refactoring. Test suite passing.
* bzrlib/transport/sftp.py:
(clear_connection_cache): Deprecated.
(_sftp_connect, _sftp_connect_uncached): Deleted.
(SFTPTransport.__init__): Simplified.
(SFTPTransport._create_connection): New method. Copied from
_sftp_connect_uncached
(SFTPTransport._get_sftp): New method. Ensures that the connection
is established.
(SFTPTransport.clone): Deleted.
(SFTPTransport.has, SFTPTransport.get, SFTPTransport.readv,
SFTPTransport._put,
SFTPTransport._put_non_atomic_helper._open_and_write_file,
SFTPTransport._mkdir, SFTPTransport.append_file,
SFTPTransport.rename, SFTPTransport._rename_and_overwrite,
SFTPTransport.delete, SFTPTransport.rmdir, SFTPTransport.stat):
Use _get_sftp.
* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_connection_error): Simplified now that sftp
does not connection on construction.
* bzrlib/tests/test_sftp_transport.py:
(SFTPLockTests.test_sftp_locks): Delete test_multiple_connections.
(FakeSFTPTransport): Deleted.
(SFTPNonServerTest.test_parse_url_with_home_dir,
SFTPNonServerTest.test_relpath,
SSHVendorBadConnection.test_bad_connection_paramiko): Delete the
from_transport parameter as it's not needed anymore.
(SFTPLatencyKnob.test_latency_knob_slows_transport,
SFTPLatencyKnob.test_default): Force connection by issuing a
request.
modified:
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2485.8.37
revision-id: v.ladeuil+lp at free.fr-20070606135202-mqhxcv6z57uce434
parent: v.ladeuil+lp at free.fr-20070606084207-6fa0f02eadtezlrf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Wed 2007-06-06 15:52:02 +0200
message:
Fix merge multiple connections. Test suite *not* passing (sftp
refactoring pending but unrelated to merge).
* bzrlib/builtins.py:
(cmd_merge.run): Fix the multiple connections bug by reusing the
tramsport used to check for a bundle and keep all other used
transports in possible_transports.
(_merge_helper): Add a possible_transports parameter for
reuse.
* bzrlib/transport/__init__.py:
(Transport._reuse_for): By default, Transports are not reusable.
(ConnectedTransport._reuse_for): ConnectedTransports are reusable
under certain conditions.
(_urlRE): Fix misleading group name.
(_try_transport_factories): Moved after get_transport (another use
case for moved lines). The do_catching_redirections was
incorrectly inserted between get_transport and
_try_transport_factories.
* bzrlib/tests/test_transport.py:
(TestReusedTransports.test_reuse_same_transport)
(TestReusedTransports.test_don_t_reuse_different_transport): Add
more tests.
* bzrlib/merge.py:
(_get_tree, Merger.set_other): Add a possible_transports parameter
for reuse.
* bzrlib/bzrdir.py:
(BzrDir.open_containing): Add a possible_transports parameter for
reuse.
* bzrlib/branch.py:
(Branch.open_containing): Add a possible_transports parameter for
reuse.
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/TransportUtil.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2485.8.36
revision-id: v.ladeuil+lp at free.fr-20070606084207-6fa0f02eadtezlrf
parent: v.ladeuil+lp at free.fr-20070605155212-k2za98dhobeikxhn
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Wed 2007-06-06 10:42:07 +0200
message:
Fix test suite to provide a better debugging experience.
* bzrlib/tests/TransportUtil.py:
(TestCaseWithConnectionHookedTransport.setUp.cleanup): hooks are
installed on demand but always reset if installed.
(TestCaseWithConnectionHookedTransport.install_hooks,
TestCaseWithConnectionHookedTransport.reset_hooks): New methods
giving a finer control on when hooks are active.
* bzrlib/tests/commands/test_push.py:
(TestPush.test_push): Install hooks when necessary.
* bzrlib/tests/commands/test_pull.py:
(TestPull.test_pull): Install hooks when necessary.
* bzrlib/tests/commands/test_missing.py:
(TestMissing.test_missing): Install hooks when necessary.
* bzrlib/tests/commands/test_merge.py:
(TestMerge.test_merge): Install hooks when necessary.
* bzrlib/tests/commands/test_init_repository.py:
(TestInitRepository.setUp): Install hooks when necessary.
* bzrlib/tests/commands/test_init.py:
(TestInit.setUp): Install hooks when necessary.
* bzrlib/tests/commands/test_checkout.pyL
(TestCheckout.test_checkout): Install hooks when necessary.
* bzrlib/tests/commands/test_cat.py:
(TestCat.test_cat): Install hooks when necessary.
* bzrlib/tests/commands/test_branch.py:
(TestBranch.setUp): Install hooks when necessary.
modified:
bzrlib/tests/TransportUtil.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
bzrlib/tests/commands/test_cat.py test_cat.py-20070525170351-vg2apsfb5j413913-1
bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
bzrlib/tests/commands/test_merge.py test_merge.py-20070525163813-v8yfs5wu77hjsx0o-1
bzrlib/tests/commands/test_missing.py test_missing.py-20070525171057-qr1z4sleurlp9b5v-1
bzrlib/tests/commands/test_pull.py test_pull.py-20070525144918-cgmunk4ici2krjnd-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
------------------------------------------------------------
revno: 2485.8.35
revision-id: v.ladeuil+lp at free.fr-20070605155212-k2za98dhobeikxhn
parent: v.ladeuil+lp at free.fr-20070603155219-f7dtbnwdqrhs0kpk
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Tue 2007-06-05 17:52:12 +0200
message:
Fix pull multiple connections.
* bzrlib/builtins.py:
(cmd_pull.run): If 'location' wasn't a bundle, the transport may
be reused.
* bzrlib/branch.py:
(Branch.open_from_transport): New method.
* bzrlib/bundle/__init__.py:
(read_mergeable_from_transport): New method.
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
------------------------------------------------------------
revno: 2485.8.34
revision-id: v.ladeuil+lp at free.fr-20070603155219-f7dtbnwdqrhs0kpk
parent: v.ladeuil+lp at free.fr-20070603130158-kfeitm6gxuxt0b1j
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Sun 2007-06-03 17:52:19 +0200
message:
Refactor mutiple connections detection and fix false positives. Only
merge and pull are still bougs.
* bzrlib/tests/commands/test_push.py:
(TestPush.test_push): Reset connections after branch and tree
creation.
* bzrlib/tests/commands/test_missing.py:
(TestMissing.test_missing): Reset connections after branch and tree
creation.
* bzrlib/tests/commands/test_merge.py:
(TestMerge.test_merge): Reset connections after branch and tree
creation.
* bzrlib/tests/commands/test_checkout.py:
(TestCheckout.test_checkout): Reset connections after branch and tree
creation.
* bzrlib/tests/commands/test_cat.py:
(TestCat.test_cat): Reset connections after branch and tree
creation.
* bzrlib/tests/commands/test_branch.py:
(TestBranch.setUp): Reset connections after branch and tree
creation.
* bzrlib/tests/TransportUtil.py:
(TransportHooks.__init__): Use _set_connection instead of
_get_FTP.
(ConnectionHookedTransport): Replace _get_FTP by _set_connection.
(TestCaseWithConnectionHookedTransport.setUp): Replace _get_FTP by
_set_connection.
(TestCaseWithConnectionHookedTransport.reset_connections): New
method.
(TestCaseWithConnectionHookedTransport.set_connection_hook):
Replace get_connection_hook.
modified:
bzrlib/tests/TransportUtil.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
bzrlib/tests/commands/test_cat.py test_cat.py-20070525170351-vg2apsfb5j413913-1
bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
bzrlib/tests/commands/test_merge.py test_merge.py-20070525163813-v8yfs5wu77hjsx0o-1
bzrlib/tests/commands/test_missing.py test_missing.py-20070525171057-qr1z4sleurlp9b5v-1
bzrlib/tests/commands/test_pull.py test_pull.py-20070525144918-cgmunk4ici2krjnd-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2485.8.33
revision-id: v.ladeuil+lp at free.fr-20070603130158-kfeitm6gxuxt0b1j
parent: v.ladeuil+lp at free.fr-20070603125849-hn65adfp30185xyu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Sun 2007-06-03 15:01:58 +0200
message:
ftp connection sharing refactored. Tests passing.
* bzrlib/transport/ftp.py:
(FtpTransport._create_connection): New method. Refactored from
_get_FTP and implementing the new connection sharing mechanism.
(FtpTransport._reconnect): New method. Helper.
modified:
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2485.8.32
revision-id: v.ladeuil+lp at free.fr-20070603125849-hn65adfp30185xyu
parent: v.ladeuil+lp at free.fr-20070603125726-xrnl6fu53figdd0x
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Sun 2007-06-03 14:58:49 +0200
message:
Keep credentials used at connection creation for reconnection purposes.
* bzrlib/transport/__init__.py:
(ConnectedTransport._init_connection): New method. Keep related
code together.
(ConnectedTransport._set_connection): Add a credentials parameter.
(ConnectedTransport._get_credentials): New method.
* bzrlib/tests/test_transport.py:
(TestConnectedTransport.test_connection_sharing_propagate_credentials):
New test.
modified:
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2485.8.31
revision-id: v.ladeuil+lp at free.fr-20070603125726-xrnl6fu53figdd0x
parent: v.ladeuil+lp at free.fr-20070602165428-sgwamqtdhksglmlu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Sun 2007-06-03 14:57:26 +0200
message:
Fix NEWS.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2485.8.30
revision-id: v.ladeuil+lp at free.fr-20070602165428-sgwamqtdhksglmlu
parent: v.ladeuil+lp at free.fr-20070602161853-miwtge8q1fjjjhvu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Sat 2007-06-02 18:54:28 +0200
message:
Implement reliable connection sharing.
* bzrlib/transport/__init__.py:
(ConnectedTransport.__init__): Use a list to contain the
connection to ensure proper sharing when transports needs to
reconnect or if transport is cloned before creating the
connection.
* bzrlib/tests/test_transport.py:
(TestConnectedTransport.test_connection_sharing): New tests.
modified:
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2485.8.29
revision-id: v.ladeuil+lp at free.fr-20070602161853-miwtge8q1fjjjhvu
parent: v.ladeuil+lp at free.fr-20070602152234-ry0ngv0zbx9yxse0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Sat 2007-06-02 18:18:53 +0200
message:
Cometic changes (and a typo).
modified:
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 2485.8.28
revision-id: v.ladeuil+lp at free.fr-20070602152234-ry0ngv0zbx9yxse0
parent: v.ladeuil+lp at free.fr-20070602144026-bvhq9zlis7l6qe7j
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Sat 2007-06-02 17:22:34 +0200
message:
Further simplifications and doc updates.
* bzrlib/transport/__init__.py:
(ConnectedTransport._urlencode_abspath): Deleted. Useless now.
(ConnectedTransport._urldecode_abspath): Deleted. Useless now.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
------------------------------------------------------------
revno: 2485.8.27
revision-id: v.ladeuil+lp at free.fr-20070602144026-bvhq9zlis7l6qe7j
parent: v.ladeuil+lp at free.fr-20070601204435-bd379jw1ux7id111
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Sat 2007-06-02 16:40:26 +0200
message:
Hearing jam saying "vila, you're trying too hard", I simplified again.
* bzrlib/transport/sftp.py:
(SFTPUrlHandling): Simplified to the point only _remote_path
remains at which point _remote_path have been put under
SFTPTransport and the class itself deleted.
(SFTPTransport._remote_path): This is the only point where home
dir related processing needs to occur. (another use case for
tracking moving lines).
* bzrlib/tests/test_sftp_transport.py:
(SFTPTransportTestRelativeRoot.test__remote_path_relative_root):
Internally we use '/~/' to indicate home dir relative paths, only
_remote_path will strip that.
modified:
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2485.8.26
revision-id: v.ladeuil+lp at free.fr-20070601204435-bd379jw1ux7id111
parent: v.ladeuil+lp at free.fr-20070601202646-wuriw6z7rfwks5ny
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Fri 2007-06-01 22:44:35 +0200
message:
Finish remote refactoring. Test suite passing.
* bzrlib/transport/remote.py:
(RemoteTransport.__init__): Simplified.
(RemoteTransport._build_medium): New abstract method.
(RemoteTransport.clone): Call the real __class__ constructor and
provide the transport to clone from.
(RemoteTransport._unparse_url): Deleted.
(RemoteTCPTransport.__init__): Deleted.
(RemoteTCPTransport._initial_split_url): New method. Set the
default port.
(RemoteTCPTransport._build_medium): New method.
(RemoteSSHTransport.__init__): Deleted.
(RemoteSSHTransport._build_medium): New method.
(RemoteHTTPTransport.__init__): Updated for cloning.
(RemoteHTTPTransport.abspath): Deleted. The inherited method is
enough.
(RemoteHTTPTransport.clone): Updated for cloning.
modified:
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
revno: 2485.8.25
revision-id: v.ladeuil+lp at free.fr-20070601202646-wuriw6z7rfwks5ny
parent: v.ladeuil+lp at free.fr-20070601100205-i8hq7x0zm8k79g90
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Fri 2007-06-01 22:26:46 +0200
message:
Separate abspath from _remote_path, the intents are different.
* bzrlib/transport/sftp.py:
(SFTPUrlHandling._combine_paths_respecting_home_dir): New method.
(SFTPUrlHandling.abspath): Take home dir into account explicitely.
(SFTPUrlHandling._remote_path): Simplified.
(SFTPTransport.__init__): Cleanup cloning.
* bzrlib/transport/http/_urllib.py:
Revert the previous _remote_path -> _unqualified_abspath renaming.
* bzrlib/transport/http/_pycurl.py:
Revert the previous _remote_path -> _unqualified_abspath renaming.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase._remote_path): Re-introduce _remote_path
instead of _unqualified_abspath.
* bzrlib/transport/ftp.py:
(FtpTransport.__init__): Cleanup cloning.
(FtpTransport.clone): Deleted. The inherited one is enough.
* bzrlib/transport/__init__.py:
(ConnectedTransport.__init__): Copy password *after* splitting the
url if needed.
(ConnectedTransport.clone): Generic clone method.
(ConnectedTransport._split_url): Cleanup.
(ConnectedTransport._initial_split_url): New method that daughter
classes can override.
(ConnectedTransport.abspath): Do not call _remote_path, the intent
is different.
* bzrlib/tests/test_transport_implementations.py:
Cleanup imports.
(TransportTests.test_clone_preserve_info): New test.
* bzrlib/tests/test_sftp_transport.py:
(FakeSFTPTransport): Add a dummy get_connection method.
(SFTPNonServerTest.test_parse_url_with_home_dir): Temporarily
disable the password checking.
modified:
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2485.8.24
revision-id: v.ladeuil+lp at free.fr-20070601100205-i8hq7x0zm8k79g90
parent: v.ladeuil+lp at free.fr-20070601080226-5styxtzexznctvg0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Fri 2007-06-01 12:02:05 +0200
message:
Finish http refactoring. Test suite passing.
* bzrlib/transport/http/_pycurl.py:
Replaces _real_abspath by _unqualified_abspath.
* bzrlib/transport/http/_urllib.py:
Replaces _real_abspath by _unqualified_abspath.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase.abspath): Deleted.
(HttpTransportBase._unqualified_abspath): Kind of _remote_path for
hhtp, replaces _real_abspath.
* bzrlib/tests/test_http.py:
(TestHttpTransportUrls.test_invalid_http_urls): Delete the test
for directories, we are not listable anyway.
modified:
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
------------------------------------------------------------
revno: 2485.8.23
revision-id: v.ladeuil+lp at free.fr-20070601080226-5styxtzexznctvg0
parent: v.ladeuil+lp at free.fr-20070601072550-oku4t5llxk4invum
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Fri 2007-06-01 10:02:26 +0200
message:
Assert the accepted schemes for sftp and ftp.
* bzrlib/transport/sftp.py:
(SFTPTransport.__init__): assert the accepted scheme.
* bzrlib/transport/ftp.py:
(FtpTransport.__init__): assert the accepted schemes.
modified:
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2485.8.22
revision-id: v.ladeuil+lp at free.fr-20070601072550-oku4t5llxk4invum
parent: v.ladeuil+lp at free.fr-20070531181534-7dh1f70t6x8tq2mc
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Fri 2007-06-01 09:25:50 +0200
message:
Finish ftp refactoring. Test suite passing.
* bzrlib/transport/ftp.py:
(FtpTransport.__init__): Simplified.
(FtpTransport._unparse_url): Deleted.
(FtpTransport._abspath): Deleted and reimplemented as a
specialisation of _remote_path. The heart is: we don't support
Unicode paths :-/
(FtpTransport.abspath): Deleted.
modified:
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2485.8.21
revision-id: v.ladeuil+lp at free.fr-20070531181534-7dh1f70t6x8tq2mc
parent: v.ladeuil+lp at free.fr-20070531181210-jcwx0x2t1wqathbv
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Thu 2007-05-31 20:15:34 +0200
message:
Simplify debug.
* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_connect_twice_is_same_content): Slightly
changed to ease debug.
modified:
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
------------------------------------------------------------
revno: 2485.8.20
revision-id: v.ladeuil+lp at free.fr-20070531181210-jcwx0x2t1wqathbv
parent: v.ladeuil+lp at free.fr-20070531180111-xef34xmn8l3hjyz0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Thu 2007-05-31 20:12:10 +0200
message:
Refactor SFTPTransport. Test suite passes.
* bzrlib/transport/sftp.py:
(SFTPUrlHandling): Simplified.
(SFTPTransport._remote_path): Deleted. SFTPUrlHandling now has a
simpler version.
* bzrlib/tests/test_sftp_transport.py:
Refactor the tests, most of them have gone to TestConnectedTransport.
(SFTPNonServerTest.test_parse_url_with_home_dir): Renamed from
test_parse_url and simplified to keep only specific tests.
modified:
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2485.8.19
revision-id: v.ladeuil+lp at free.fr-20070531180111-xef34xmn8l3hjyz0
parent: v.ladeuil+lp at free.fr-20070531175656-uwy1n9l8x3im9evb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Thu 2007-05-31 20:01:11 +0200
message:
Add a new ConnectedTransport class refactored from [s]ftp and http.
* bzrlib/transport/__init__.py:
(split_url): Deprecated.
(ConnectedTransport): New class.
* bzrlib/tests/test_transport.py:
(TestConnectedTransport): New class.
modified:
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2485.8.18
revision-id: v.ladeuil+lp at free.fr-20070531175656-uwy1n9l8x3im9evb
parent: v.ladeuil+lp at free.fr-20070531175417-vtcav2eh81c38clk
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Thu 2007-05-31 19:56:56 +0200
message:
PathNotChild inherits from PathError, not BzrError.
* bzrlib/errors.py:
(PathNotChild): Really a PathError.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 2485.8.17
revision-id: v.ladeuil+lp at free.fr-20070531175417-vtcav2eh81c38clk
parent: v.ladeuil+lp at free.fr-20070530071516-gd5g28s954tfz63g
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Thu 2007-05-31 19:54:17 +0200
message:
Fix the fix.
* bzrlib/builtins.py:
(cmd_missing.run): Oops, add the missing '\n'.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2485.8.16
revision-id: v.ladeuil+lp at free.fr-20070530071516-gd5g28s954tfz63g
parent: v.ladeuil+lp at free.fr-20070530071006-hsj03kfrky5h3xrq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Wed 2007-05-30 09:15:16 +0200
message:
Create a new, empty, ConnectedTransport class.
* bzrlib/transport/sftp.py:
(SFTPUrlHandling): Based on ConnectedTransport.
* bzrlib/transport/remote.py:
(RemoteTransport): Based on ConnectedTransport.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase): Based on ConnectedTransport.
* bzrlib/transport/ftp.py:
(FtpTransport): Based on ConnectedTransport.
* bzrlib/transport/__init__.py:
(ConnectedTransport): New class.
modified:
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2485.8.15
revision-id: v.ladeuil+lp at free.fr-20070530071006-hsj03kfrky5h3xrq
parent: v.ladeuil+lp at free.fr-20070529133516-z5bc236n3qk5b6ex
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Wed 2007-05-30 09:10:06 +0200
message:
Delete the ftp connection cache.
* bzrlib/transport/ftp.py:
(_find_FTP): Deleted.
(FtpTransport._get_FTP): Create a new connection if none is
available.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2485.8.14
revision-id: v.ladeuil+lp at free.fr-20070529133516-z5bc236n3qk5b6ex
parent: v.ladeuil+lp at free.fr-20070529132124-zszi9sihkjcro6ko
parent: v.ladeuil+lp at free.fr-20070529131741-df4zd9ko5y1w1g6d
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Tue 2007-05-29 15:35:16 +0200
message:
merge fix for bug 111702
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2476.3.13
revision-id: v.ladeuil+lp at free.fr-20070529131741-df4zd9ko5y1w1g6d
parent: v.ladeuil+lp at free.fr-20070504103507-cm0woizea22taavd
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Tue 2007-05-29 15:17:41 +0200
message:
merge bzr.dev at 2495
added:
bzrlib/counted_lock.py counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
doc/developers/ docdevelopers-20070507164002-62r0es2b29myxges-1
doc/developers/incremental-push-pull.txt incrementalpushpull.-20070508045640-zneiu1yzbci574c6-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap-rationale.txt performanceroadmapra-20070507174912-mwv3xv517cs4sisd-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
renamed:
HACKING => doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
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/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_treebuilder.py test_treebuilder.py-20060907214856-4omn6hf1u7fvrart-2
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
doc/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2476.3.12
revision-id: v.ladeuil+lp at free.fr-20070504103507-cm0woizea22taavd
parent: v.ladeuil+lp at free.fr-20070504103356-c371vuio9ldhnaw8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Fri 2007-05-04 12:35:07 +0200
message:
Fix bug #111702 with a first attempt to refactor Transport.get_transport()
------------------------------------------------------------
revno: 2476.3.11
revision-id: v.ladeuil+lp at free.fr-20070504103356-c371vuio9ldhnaw8
parent: v.ladeuil+lp at free.fr-20070504102643-3qbwrvmvzjildjez
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Fri 2007-05-04 12:33:56 +0200
message:
Cosmetic changes.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 2476.3.10
revision-id: v.ladeuil+lp at free.fr-20070504102643-3qbwrvmvzjildjez
parent: v.ladeuil+lp at free.fr-20070503212944-naxq1qsq297uxauz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Fri 2007-05-04 12:26:43 +0200
message:
Add a test for create_branch_convenience. Mark some places to test for multiple connections.
modified:
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2476.3.9
revision-id: v.ladeuil+lp at free.fr-20070503212944-naxq1qsq297uxauz
parent: v.ladeuil+lp at free.fr-20070503212714-3sbdmehsv8kemomw
parent: pqm at pqm.ubuntu.com-20070503194912-pzlcms91kk2uqfdo
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Thu 2007-05-03 23:29:44 +0200
message:
merge bzr.dev at 2480
added:
doc/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
doc/default.css default.css-20060622101119-tgwtdci8z769bjb9-1
------------------------------------------------------------
revno: 2476.3.8
revision-id: v.ladeuil+lp at free.fr-20070503212714-3sbdmehsv8kemomw
parent: v.ladeuil+lp at free.fr-20070503124529-3na89ialmyl9bogy
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Thu 2007-05-03 23:27:14 +0200
message:
Mark transports that need to be instrumented or refactored to check
multiple connections. Various cosmetic changes.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2476.3.7
revision-id: v.ladeuil+lp at free.fr-20070503124529-3na89ialmyl9bogy
parent: v.ladeuil+lp at free.fr-20070503113827-25fhckdmd2oslags
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Thu 2007-05-03 14:45:29 +0200
message:
Fix failing tests.
* tests/test_bzrdir.py:
(SampleBzrDirFormat.initialize): Add a transports parameter for reuse.
modified:
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 2476.3.6
revision-id: v.ladeuil+lp at free.fr-20070503113827-25fhckdmd2oslags
parent: v.ladeuil+lp at free.fr-20070503095947-k2o8rnp5ug6uriu1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Thu 2007-05-03 13:38:27 +0200
message:
Fix the 'init connects multiple times' in a different way.
* transport/__init__.py:
(get_transport): Make transports default to None instead of [],
it's easier and less confusing in its other uses.
* tests/test_bzrdir.py:
(TestBzrDirFormat): Remove the test, the new fix is harder to test
for. What we really want to test is that *connections* are reused,
LocalTransport.clone create new objects anyway, so there is no way
to verify that a LocalTransport is really reused. So we must
instrument transports that use connection to be able to catch
multiple connections.
* bzrdir.py:
(BzrDir.create): Add a transports parameter for reuse.
(BzrDir.create_branch_convenience): Add a transports parameter for
reuse.
(BzrDirFormat.initialize): Add a transports parameter for reuse.
* builtins.py:
(cmd_init.run): Pass the known transport to
create_branch_convenience in its own list.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2476.3.5
revision-id: v.ladeuil+lp at free.fr-20070503095947-k2o8rnp5ug6uriu1
parent: v.ladeuil+lp at free.fr-20070502203101-prcuwowzkz5qh0gn
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Thu 2007-05-03 11:59:47 +0200
message:
Naive implementation of transport reuse by Transport.get_transport().
* transport/__init__.py:
(get_transport): Accept a list of reusable transports as a
parameter.
* tests/test_transport.py:
(TestReusedTransports): Some basic tests.
modified:
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2476.3.4
revision-id: v.ladeuil+lp at free.fr-20070502203101-prcuwowzkz5qh0gn
parent: v.ladeuil+lp at free.fr-20070502201837-od1q12zbvr90kyni
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Wed 2007-05-02 22:31:01 +0200
message:
Add tests.
* tests/test_bzrdir.py:
(TestBzrDirFormat): Add tests for the new parameters.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 2476.3.3
revision-id: v.ladeuil+lp at free.fr-20070502201837-od1q12zbvr90kyni
parent: v.ladeuil+lp at free.fr-20070502162141-zwqhrx0ydx7hzwv0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Wed 2007-05-02 22:18:37 +0200
message:
Fix bug #111702.
* bzrdir.py:
(BzrDir.create_branch_convenience): Add 'transport' as an
alternate way to specify the URL to create the branch at.
* builtins.py:
(cmd_init.run): We have a transport, use it.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 2476.3.2
revision-id: v.ladeuil+lp at free.fr-20070502162141-zwqhrx0ydx7hzwv0
parent: v.ladeuil+lp at free.fr-20070502144224-xgusmp6ra32m055m
parent: john at arbash-meinel.com-20070502145420-k2vebnl0rd45q8kk
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Wed 2007-05-02 18:21:41 +0200
message:
merge jam's second fix for bug 75721
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2476.3.1
revision-id: v.ladeuil+lp at free.fr-20070502144224-xgusmp6ra32m055m
parent: pqm at pqm.ubuntu.com-20070502125159-zpnij2o99tlddedp
parent: john at arbash-meinel.com-20070502143655-id25373m3lgue8ke
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 111702
timestamp: Wed 2007-05-02 16:42:24 +0200
message:
merge jam's fix for bug 75721
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2485.8.13
revision-id: v.ladeuil+lp at free.fr-20070529132124-zszi9sihkjcro6ko
parent: v.ladeuil+lp at free.fr-20070529131404-lnsmdchfkfhnrvrw
parent: pqm at pqm.ubuntu.com-20070525050023-ip6kst9coq8a32z5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Tue 2007-05-29 15:21:24 +0200
message:
merge bzr.dev at 2495
added:
bzrlib/counted_lock.py counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_treebuilder.py test_treebuilder.py-20060907214856-4omn6hf1u7fvrart-2
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2485.8.12
revision-id: v.ladeuil+lp at free.fr-20070529131404-lnsmdchfkfhnrvrw
parent: v.ladeuil+lp at free.fr-20070525174710-y23iej03rnb2su18
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Tue 2007-05-29 15:14:04 +0200
message:
Cosmetic change.
* bzrlib/transport/ftp.py:
(FtpServer.setUp): Update comment.
modified:
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2485.8.11
revision-id: v.ladeuil+lp at free.fr-20070525174710-y23iej03rnb2su18
parent: v.ladeuil+lp at free.fr-20070525171252-hsooebpkqtb3j6ef
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Fri 2007-05-25 19:47:10 +0200
message:
Fix some display leaks in tests.
* bzrlib/tests/commands/test_cat.py:
(TestCat.setUp): Redirect stdout as cat uses it directly (via
several indirections which ending in Tree.print_file).
* bzrlib/builtins.py (cmd_missing):
Fix some PEP8 issues. Use self.outf instead of 'print'.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/commands/test_cat.py test_cat.py-20070525170351-vg2apsfb5j413913-1
------------------------------------------------------------
revno: 2485.8.10
revision-id: v.ladeuil+lp at free.fr-20070525171252-hsooebpkqtb3j6ef
parent: v.ladeuil+lp at free.fr-20070525163929-l6x2jv17ogc9q7s4
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Fri 2007-05-25 19:12:52 +0200
message:
Add test for cat and missing.
* bzrlib/tests/commands/__init__.py:
(test_suite): Add test_cat and test_missing.
* bzrlib/tests/commands/test_cat.py:
New file.
* bzrlib/tests/commands/test_missing.py:
New file.
added:
bzrlib/tests/commands/test_cat.py test_cat.py-20070525170351-vg2apsfb5j413913-1
bzrlib/tests/commands/test_missing.py test_missing.py-20070525171057-qr1z4sleurlp9b5v-1
modified:
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
------------------------------------------------------------
revno: 2485.8.9
revision-id: v.ladeuil+lp at free.fr-20070525163929-l6x2jv17ogc9q7s4
parent: v.ladeuil+lp at free.fr-20070525151818-xpagxvflu5j3yiq6
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Fri 2007-05-25 18:39:29 +0200
message:
Add test for init-repository and merge.
* bzrlib/tests/commands/__init__.py:
(test_suite): Add test_init_repository and test_merge.
* bzrlib/tests/commands/test_merge.py:
New file.
* bzrlib/tests/commands/test_init_repository.py:
New file.
added:
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
bzrlib/tests/commands/test_merge.py test_merge.py-20070525163813-v8yfs5wu77hjsx0o-1
modified:
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
------------------------------------------------------------
revno: 2485.8.8
revision-id: v.ladeuil+lp at free.fr-20070525151818-xpagxvflu5j3yiq6
parent: v.ladeuil+lp at free.fr-20070525151105-iabak02mwjjxrxty
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Fri 2007-05-25 17:18:18 +0200
message:
Add test for checkout.
* bzrlib/tests/commands/__init__.py:
(test_suite): Add test_checkout.
* bzrlib/tests/commands/test_checkout.py:
New file.
added:
bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
modified:
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
------------------------------------------------------------
revno: 2485.8.7
revision-id: v.ladeuil+lp at free.fr-20070525151105-iabak02mwjjxrxty
parent: v.ladeuil+lp at free.fr-20070525144142-wp4vof8hjjn3g9zx
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Fri 2007-05-25 17:11:05 +0200
message:
Add test for pull.
* bzrlib/tests/commands/__init__.py:
(test_suite): Add test_pull.
* bzrlib/tests/commands/test_pull.py:
New file.
added:
bzrlib/tests/commands/test_pull.py test_pull.py-20070525144918-cgmunk4ici2krjnd-1
modified:
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
------------------------------------------------------------
revno: 2485.8.6
revision-id: v.ladeuil+lp at free.fr-20070525144142-wp4vof8hjjn3g9zx
parent: v.ladeuil+lp at free.fr-20070525113840-s4puzzxhbspe6mop
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Fri 2007-05-25 16:41:42 +0200
message:
Fix the 'FtpServer' so that it can handle full bzr commands.
* bzrlib/transport/ftp.py:
(FtpServer.setUp): Allows for 10000 requests instead of 1000 or
the server dies peacefully and so quietly that the client still
waits for him to asnswer the requests.
(FtpServer._asyncore_loop_ignore_EBADF): Add a FIXME waiting for
more understanding no how to report the problem.
* bzrlib/tests/commands/test_branch.py:
(TestBranch): Tests combinations of local and remote branches.
* bzrlib/tests/commands/__init__.py:
(test_suite): Add test_push.
* bzrlib/tests/commands/test_push.py:
New file.
added:
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
modified:
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2485.8.5
revision-id: v.ladeuil+lp at free.fr-20070525113840-s4puzzxhbspe6mop
parent: v.ladeuil+lp at free.fr-20070520173839-e5d44epigc5ungdh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: reuse.transports
timestamp: Fri 2007-05-25 13:38:40 +0200
message:
Factor out InstrumentedTransport.
* bzrlib/tests/commands/test_init.py:
Simplified by using TransportUtils
* bzrlib/tests/commands/test_branch.py:
Simplified by using TransportUtils
* bzrlib/tests/TransportUtil.py:
Factored out from commands/test_init.py and
commands/test_branch.py. Another use case for tracking lines moved
across files.
added:
bzrlib/tests/TransportUtil.py transportutil.py-20070525113600-5v2igk89s8fensom-1
modified:
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
------------------------------------------------------------
revno: 2485.8.4
revision-id: v.ladeuil+lp at free.fr-20070520173839-e5d44epigc5ungdh
parent: v.ladeuil+lp at free.fr-20070520095758-6ci8iwmirzd5y6yu
committer: v.ladeuil+lp at free.fr
branch nick: reuse.transports
timestamp: Sun 2007-05-20 18:38:39 +0100
message:
Add tests for branch command.
* bzrlib/tests/commands/test_init.py:
Fix copyright.
* bzrlib/tests/commands/__init__.py:
(test_suite): Add test_branch.
* bzrlib/tests/commands/test_branch.py:
New file. Test the branch command.
added:
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
modified:
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
------------------------------------------------------------
revno: 2485.8.3
revision-id: v.ladeuil+lp at free.fr-20070520095758-6ci8iwmirzd5y6yu
parent: v.ladeuil+lp at free.fr-20070518182031-gbg2cgidv5l20x9p
committer: v.ladeuil+lp at free.fr
branch nick: reuse.transports
timestamp: Sun 2007-05-20 10:57:58 +0100
message:
Change the file naming to clearly separate the command behavior
testing.
* bzrlib/tests/__init__.py:
(packages_to_test): Add tests.commands.
* bzrlib/tests/commands/__init__.py:
New file. Add all command tests to the test suite.
added:
bzrlib/tests/commands/ commands-20070518182516-v16lhwkl07jbj1k2-1
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
renamed:
bzrlib/tests/test_init.py => bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2485.8.2
revision-id: v.ladeuil+lp at free.fr-20070518182031-gbg2cgidv5l20x9p
parent: v.ladeuil+lp at free.fr-20070515174032-qzdkangpv29l9e7g
committer: v.ladeuil+lp at free.fr
branch nick: reuse.transports
timestamp: Fri 2007-05-18 19:20:31 +0100
message:
Takes Robert comments into account.
* bzrlib/transport/ftp.py:
(FtpTransport.__init__): Write a better explanation.
* bzrlib/tests/test_init.py:
(InstrumentedTransport): Just make hooks a class attribute.
(InstrumentedTransport._get_FTP): Run hook directly in the for
loop.
(TransportHooks.run_hook, TransportHooks.uninstall_hook): Not
needed. The hooks should be cleaned up by the test itself.
(TestInit.setUp.cleanup): Resset to default hooks.
modified:
bzrlib/tests/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2485.8.1
revision-id: v.ladeuil+lp at free.fr-20070515174032-qzdkangpv29l9e7g
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: v.ladeuil+lp at free.fr
branch nick: reuse.transports
timestamp: Tue 2007-05-15 18:40:32 +0100
message:
Add a test that check that init connect only once. It fails.
* __init__.py:
(test_suite): Register the new test class.
* test_init.py:
(InstrumentedTransport): A transport that can track connections.
(TransportHooks): Transport specific hooks.
(TestInit): Iniit command behavior tests.
* ftp.py:
(FtpTransport.__init__): Mark place that need fixing regarding
transport connection sharing
* builtins.py:
(cmd_init.run): Mark places that need fixing regarding transport
connection sharing.
added:
bzrlib/tests/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 2625.1.20
revision-id: pqm at pqm.ubuntu.com-20070721163603-p17kh2wgzkhbef1d
parent: pqm at pqm.ubuntu.com-20070720233740-hjfxo6dx2ytwkros
parent: larstiq at larstiq.dyndns.org-20070721153237-rh7v5kz6rh3r2mza
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-07-21 17:36:03 +0100
message:
Fix bug #127115 by checking for self.other_rev_id being None in Merger.set_pending()
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 2625.1.19.1.2
revision-id: larstiq at larstiq.dyndns.org-20070721153237-rh7v5kz6rh3r2mza
parent: larstiq at larstiq.dyndns.org-20070721141117-ogghgpjyh02h8fri
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bug-127115
timestamp: Sat 2007-07-21 17:32:37 +0200
message:
As Aaron explained #127115 is more general, failing whenever other's basis is an ancestor of this' basis.
modified:
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 2625.1.19.1.1
revision-id: larstiq at larstiq.dyndns.org-20070721141117-ogghgpjyh02h8fri
parent: pqm at pqm.ubuntu.com-20070720233740-hjfxo6dx2ytwkros
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: bug-127115
timestamp: Sat 2007-07-21 16:11:17 +0200
message:
Fix bug #127115 by checking for self.other_rev_id being None in Merger.set_pending()
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 2625.1.19
revision-id: pqm at pqm.ubuntu.com-20070720233740-hjfxo6dx2ytwkros
parent: pqm at pqm.ubuntu.com-20070720194822-smqttk05w6efypf0
parent: abentley at panoramicfeedback.com-20070720202707-x6qb9p0ib510s5x7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-07-21 00:37:40 +0100
message:
Raise NoSuchId when get_file_sha1 is invoked with a baed file id
modified:
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.56
revision-id: abentley at panoramicfeedback.com-20070720202707-x6qb9p0ib510s5x7
parent: abentley at panoramicfeedback.com-20070720201437-svhxdzhjte77mga4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-07-20 16:27:07 -0400
message:
Raise NoSuchId when get_file_sha1 is invoked with a baed file id
modified:
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.55
revision-id: abentley at panoramicfeedback.com-20070720201437-svhxdzhjte77mga4
parent: abentley at panoramicfeedback.com-20070720125633-9wek52fpzqtatsfh
parent: pqm at pqm.ubuntu.com-20070720194822-smqttk05w6efypf0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-07-20 16:14:37 -0400
message:
Merge bzr.dev
added:
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
bzrlib/email_message.py email_message.py-20070718143823-660zfcl54xi1v65u-1
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_email_message.py test_email_message.p-20070718143823-660zfcl54xi1v65u-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2625.1.18
revision-id: pqm at pqm.ubuntu.com-20070720194822-smqttk05w6efypf0
parent: pqm at pqm.ubuntu.com-20070720172520-i2ezksmrduaonojd
parent: john at arbash-meinel.com-20070720182620-948wu6weli9aupkq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-07-20 20:48:22 +0100
message:
(John Arbash Meinel) Implement DirState._read_dirblocks() in pyrex
added:
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2474.1.74
revision-id: john at arbash-meinel.com-20070720182620-948wu6weli9aupkq
parent: john at arbash-meinel.com-20070720173448-cn7og836bl8dovwv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-07-20 13:26:20 -0500
message:
Revert the accidental removal of the Unicode normalization check code.
It was done to profile how much it was costing us, but it wasn't meant to be removed.
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
------------------------------------------------------------
revno: 2474.1.73
revision-id: john at arbash-meinel.com-20070720173448-cn7og836bl8dovwv
parent: john at arbash-meinel.com-20070720170136-pa6kb99lxxmekyji
parent: pqm at pqm.ubuntu.com-20070720161548-nppg3mvd38gbuaid
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-07-20 12:34:48 -0500
message:
[merge] bzr.dev 2641
removed:
bzrlib/bundle/common.py common.py-20050619223838-f25048f6638f04c6
bzrlib/bundle/old/ old-20051119041827-8f2417a9cc3b67f2
bzrlib/bundle/old/send_changeset.py send_changeset.py-20050628200204-9478d383946f1871
added:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/email_message.py email_message.py-20070718143823-660zfcl54xi1v65u-1
bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/test_email_message.py test_email_message.p-20070718143823-660zfcl54xi1v65u-2
bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
bzrlib/transport/unlistable.py unlistable.py-20070714093417-5gc9d821to85zo4t-2
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
renamed:
bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
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/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
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
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2474.1.72
revision-id: john at arbash-meinel.com-20070720170136-pa6kb99lxxmekyji
parent: john at arbash-meinel.com-20070718204238-5gi11fx04q7zt72d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-07-20 12:01:36 -0500
message:
Document a bit more what is going on in _dirstate_helpers_c.pyx, from Martin's comments
modified:
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.71
revision-id: john at arbash-meinel.com-20070718204238-5gi11fx04q7zt72d
parent: john at arbash-meinel.com-20070718203014-u8gpbqn5z9ftx1tu
parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Wed 2007-07-18 15:42:38 -0500
message:
[merge] bzr.dev 2625
added:
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/_knit_load_data_py.py _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
bzrlib/benchmarks/bench_knit.py bench_knit.py-20070509145850-pan5jnd3hl7mfdya-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/tests/blackbox/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-1
bzrlib/tests/repository_implementations/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/workingtree_implementations/test_uncommit.py test_uncommit.py-20070712063057-8zaprw7t7lcqxeje-1
bzrlib/util/tests/ bzrlibutiltests-20070713054332-wmm62qs3xvyfzwup-1
bzrlib/util/tests/__init__.py __init__.py-20070713054446-oliu3oth0gy08y0t-1
bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
doc/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/developers/diff.txt diff.txt-20070716233605-2q6jzorua7mr42jk-1
doc/developers/indices.txt indices.txt-20070713142939-m5cdnp31u8ape0td-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
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_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/capture_tree.py capture_tree.py-20051004100938-c7ff053182f5ae51
tools/rst2prettyhtml.py rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
tools/trace-revisions tracerevisions-20051107162041-9dfee0a7324d206d
------------------------------------------------------------
revno: 2474.1.70
revision-id: john at arbash-meinel.com-20070718203014-u8gpbqn5z9ftx1tu
parent: john at arbash-meinel.com-20070713212835-m330r85zq4xwgipi
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Wed 2007-07-18 15:30:14 -0500
message:
Lot's of fixes from Martin's comments.
Fix signed/unsigned character issues
Add lots of comments to help understand the code
Add tests for proper Unicode handling (we should abort if we get a Unicode string,
and we should correctly handle utf-8 strings)
modified:
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
------------------------------------------------------------
revno: 2474.1.69
revision-id: john at arbash-meinel.com-20070713212835-m330r85zq4xwgipi
parent: john at arbash-meinel.com-20070713175009-sylhp1kst6145v0f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-07-13 16:28:35 -0500
message:
Thanks to Jan 'RedBully' Seiffert, some review cleanups
changes size_t to unsigned.
Check alignment on strings before using integer loops.
Just use a simple backwards checking loop for _memrchr
modified:
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.68
revision-id: john at arbash-meinel.com-20070713175009-sylhp1kst6145v0f
parent: john at arbash-meinel.com-20070712181059-xnomv3tzzsb2hpx5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-07-13 12:50:09 -0500
message:
Review feedback from Martin, mostly documentation updates.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
------------------------------------------------------------
revno: 2474.1.67
revision-id: john at arbash-meinel.com-20070712181059-xnomv3tzzsb2hpx5
parent: john at arbash-meinel.com-20070712163402-lp91q157w5etslrj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-07-12 13:10:59 -0500
message:
Add NEWS entries for performance improvements.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2474.1.66
revision-id: john at arbash-meinel.com-20070712163402-lp91q157w5etslrj
parent: john at arbash-meinel.com-20070712052601-n0bcu3r5nlu1skj4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-07-12 11:34:02 -0500
message:
Some restructuring.
Move bisect_path_* to private functions
Move cmp_path_by_dirblock to a private function,
since it is only used by the bisect_path functions.
Add tests that the compiled versions are actually used.
This catches cases when the import fails for the wrong reason.
Move some code around to make it closer to sorted by name.
modified:
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
------------------------------------------------------------
revno: 2474.1.65
revision-id: john at arbash-meinel.com-20070712052601-n0bcu3r5nlu1skj4
parent: john at arbash-meinel.com-20070712051503-ntboo0z3prcrcg3t
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-07-12 00:26:01 -0500
message:
Found an import dependency bug if the compiled version is not available.
Basically, we need a constant from dirstate.py, but we can't import the module directly
because before the module finishes loading, it imports _dirstate_helper*.
but bzrlib.dirstate.DirState *has* been defined at that point,
so we can import it.
But now the tests pass with and without running 'make' first.
modified:
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
------------------------------------------------------------
revno: 2474.1.64
revision-id: john at arbash-meinel.com-20070712051503-ntboo0z3prcrcg3t
parent: john at arbash-meinel.com-20070712051426-u9auufylv5cba940
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-07-12 00:15:03 -0500
message:
Fix dirstate benchmarks for new layout.
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
------------------------------------------------------------
revno: 2474.1.63
revision-id: john at arbash-meinel.com-20070712051426-u9auufylv5cba940
parent: john at arbash-meinel.com-20070711234520-do3h7zw8skbathpz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-07-12 00:14:26 -0500
message:
Found a small bug in the python version of _read_dirblocks.
This reveals that the code is not as directly tested as it should be.
Consider refactoring all test_dirstate to use both implementations.
Or at least at more direct tests.
modified:
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
------------------------------------------------------------
revno: 2474.1.62
revision-id: john at arbash-meinel.com-20070711234520-do3h7zw8skbathpz
parent: john at arbash-meinel.com-20070711225935-llcal92udviwxfp4
parent: pqm at pqm.ubuntu.com-20070711162842-8fx9cc0c3ogyxudl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Wed 2007-07-11 18:45:20 -0500
message:
[merge] bzr.dev 2601
added:
bzrlib/api.py api.py-20070626082640-35lspz7j0ys7a8ld-1
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/counted_lock.py counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/tests/blackbox/test_lsprof.py test_lsprof.py-20070622025641-nbsm2svy8anvj9df-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
bzrlib/transport/brokenrename.py brokenrename.py-20070628050843-mbwebk50srn93rut-1
doc/developers/ docdevelopers-20070507164002-62r0es2b29myxges-1
doc/developers/add.txt add.txt-20070515094933-xhgz3xjc7o0edok0-2
doc/developers/annotate.txt annotate.txt-20070515142136-rq51c4kqhwrjsh8k-1
doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
doc/developers/bundle-creation.txt bundlecreation.rst-20070527173558-rqaqxn1al7vzgcto-1
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
doc/developers/dirstate.txt dirstate.txt-20070618020404-cdhv0ecgrukomemg-2
doc/developers/gc.txt gc.txt-20070515102609-90x5kzjokrurfbke-1
doc/developers/incremental-push-pull.txt incrementalpushpull.-20070508045640-zneiu1yzbci574c6-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/initial-push-pull.txt initialpushpull.rst-20070527184539-wodba32mi5dehhct-1
doc/developers/merge-scaling.txt mergescaling.rst-20070527173558-rqaqxn1al7vzgcto-2
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
doc/developers/performance-roadmap-rationale.txt performanceroadmapra-20070507174912-mwv3xv517cs4sisd-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/planned-change-integration.txt plannedchangeintegra-20070619004702-i1b3ccamjtfaoq6w-1
doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
doc/developers/revert.txt revert.txt-20070515111013-grc9hgp21zxqbwbl-1
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
doc/developers/status.txt status.txt-20070702023117-6xss29lx170qndwr-1
doc/developers/uncommit.txt uncommit.txt-20070621042721-4clw8ucb9u9yda2h-1
renamed:
HACKING => doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
bzrlib/graph.py => bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/tests/test_graph.py => bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_add.py bench_add.py-20060516064526-6342399b2967266c
bzrlib/benchmarks/bench_bench.py bench_bench.py-20060609084943-2lv2wsi61vhkmj7b-1
bzrlib/benchmarks/bench_cache_utf8.py bench_encoding.py-20060810000746-nv69wfkxei7w2cij-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_inventory.py bench_inventory.py-20060611112709-gjo1kx0oudyo9qbv-1
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
bzrlib/benchmarks/bench_rocks.py bench_rocks.py-20060608120339-3ydxl3v2cori44zb-1
bzrlib/benchmarks/bench_sftp.py bench_sftp.py-20060810114659-67c1edb27503ebde
bzrlib/benchmarks/bench_startup.py bench_startup.py-20061006075337-q49on3zvfcbvarn3-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/benchmarks/bench_transform.py bench_transform.py-20060525041052-ysn0hlw94gcc57lm-1
bzrlib/benchmarks/bench_workingtree.py bench_workingtree.py-20060527061822-cxrgsa9ax2q4d82q-1
bzrlib/benchmarks/bench_xml.py bench_xml.py-20060816202544-ty0p415bb7om5gzd-1
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/generate_ids.py generate_ids.py-20061102205935-z3do15ipw6m7v26u-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/strace.py strace.py-20070323001526-6zquhhw8leb9m6j8-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_aliases.py test_aliases.py-20060210230318-f0c08c9294dbfae1
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
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_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_inventory.py test_inventory.py-20060921205529-9rwo2222xhm8edti-1
bzrlib/tests/blackbox/test_join.py test_join.py-20060928210902-95dkqa6boh8uq92b-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_remerge.py test_remerge.py-20060629162739-o9m3s6143v8jnr2y-1
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_revno.py test_revno.py-20051204214528-2f0bf83a71b7656a
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_testament.py test_testament.py-20060816161839-snq405g3jk15gpax-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/blackbox/test_whoami.py test_whoami.py-20060629025641-8h3m2ch7kutqx7ug-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_api.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
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_strace.py test_strace.py-20070323001526-6zquhhw8leb9m6j8-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_treebuilder.py test_treebuilder.py-20060907214856-4omn6hf1u7fvrart-2
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
contrib/bash/bzr.simple bzr-20050503074841-dfc41af1e02111f9
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
doc/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
------------------------------------------------------------
revno: 2474.1.61
revision-id: john at arbash-meinel.com-20070711225935-llcal92udviwxfp4
parent: john at arbash-meinel.com-20070711215705-x6l2fdioh050zxzp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Wed 2007-07-11 17:59:35 -0500
message:
Finish fixing DirState._bisect and the bisect tests
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
------------------------------------------------------------
revno: 2474.1.60
revision-id: john at arbash-meinel.com-20070711215705-x6l2fdioh050zxzp
parent: john at arbash-meinel.com-20070711214905-e2cxwnuoxr9r1o9r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Wed 2007-07-11 16:57:05 -0500
message:
Get rid of strchr in favor of memchr
modified:
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.59
revision-id: john at arbash-meinel.com-20070711214905-e2cxwnuoxr9r1o9r
parent: john at arbash-meinel.com-20070711000154-4et8yf8si3jgxmgc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Wed 2007-07-11 16:49:05 -0500
message:
Make sure to set basename_len. With that patch, the tests pass.
modified:
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
------------------------------------------------------------
revno: 2474.1.58
revision-id: john at arbash-meinel.com-20070711000154-4et8yf8si3jgxmgc
parent: john at arbash-meinel.com-20070710145123-jv3wcj10qdvkgmt8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Tue 2007-07-10 19:01:54 -0500
message:
(broken) Try to properly implement DirState._bisect*
Involves rewriting some helper functions.
Currently something is wrong.
modified:
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
------------------------------------------------------------
revno: 2474.1.57
revision-id: john at arbash-meinel.com-20070710145123-jv3wcj10qdvkgmt8
parent: john at arbash-meinel.com-20070509152850-spj91ozbgzpgxmw7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Tue 2007-07-10 09:51:23 -0500
message:
Move code around to refactor according to our pyrex extension design.
This creates a _dirstate_helpers_py.py next to _dirstate_helpers_c.pyx
Rather than having a 'bzrlib.compiled.*' directory.
removed:
bzrlib/compiled/ bzrlibcompiled-20070503195935-dmd5sxtc930u4p37-1
bzrlib/compiled/__init__.py __init__.py-20070503201057-u425eni465q4idwn-1
bzrlib/tests/compiled/ bzrlibtestscompiled-20070504021933-pn9n1zh8fkzcr2z1-1
bzrlib/tests/compiled/__init__.py __init__.py-20070504035751-jsbn00xodv0y1eve-1
added:
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
renamed:
bzrlib/compiled/dirstate_helpers.pyx => bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/tests/compiled/test_dirstate_helpers.py => bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
------------------------------------------------------------
revno: 2474.1.56
revision-id: john at arbash-meinel.com-20070509152850-spj91ozbgzpgxmw7
parent: john at arbash-meinel.com-20070507231309-mtyzwjrascrg5tiq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Wed 2007-05-09 10:28:50 -0500
message:
Remove a lot of unused definitions.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.55
revision-id: john at arbash-meinel.com-20070507231309-mtyzwjrascrg5tiq
parent: john at arbash-meinel.com-20070507230047-53ozoz7og6n2j24i
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 18:13:09 -0500
message:
Remove an unused (and ugly) pyrex function.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.54
revision-id: john at arbash-meinel.com-20070507230047-53ozoz7og6n2j24i
parent: john at arbash-meinel.com-20070507221117-l6pjpggfs9p2dtwy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 18:00:47 -0500
message:
Optimize the simple case that the strings are the same object.
Add some TODO statements that we might consider.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.53
revision-id: john at arbash-meinel.com-20070507221117-l6pjpggfs9p2dtwy
parent: john at arbash-meinel.com-20070507214233-czz6gaimsje4qka6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 17:11:17 -0500
message:
Changing Reader.get_next_str (which returns a Python String)
into a c function saves a lot of time.
Specifically it avoids a GetAttr call, and a PyObject_CallObject
This drops the times down to:
...test__read_dirblocks_20k_tree_0_parents_c OK 122ms/ 2561ms
...test__read_dirblocks_20k_tree_0_parents_py OK 235ms/ 2606ms
...test__read_dirblocks_20k_tree_1_parent_c OK 175ms/ 2797ms
...test__read_dirblocks_20k_tree_1_parent_py OK 358ms/ 3014ms
...test__read_dirblocks_20k_tree_2_parents_c OK 259ms/ 2992ms
...test__read_dirblocks_20k_tree_2_parents_py OK 498ms/ 3232ms
We are close to being 2x faster than the python implementation.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.52
revision-id: john at arbash-meinel.com-20070507214233-czz6gaimsje4qka6
parent: john at arbash-meinel.com-20070507213645-le9y48efqghhes86
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 16:42:33 -0500
message:
Add a benchmark timing how long it takes to add ~20k entries to a DirState object.
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
------------------------------------------------------------
revno: 2474.1.51
revision-id: john at arbash-meinel.com-20070507213645-le9y48efqghhes86
parent: john at arbash-meinel.com-20070507213102-i2nuwkr0vfj8u98u
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 16:36:45 -0500
message:
Fix one benchmark so it is actually writing data instead of a null block.
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
------------------------------------------------------------
revno: 2474.1.50
revision-id: john at arbash-meinel.com-20070507213102-i2nuwkr0vfj8u98u
parent: john at arbash-meinel.com-20070507211832-430v0s9bvjud3jeg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 16:31:02 -0500
message:
Refactor a bit to make benchmark setup time faster.
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
------------------------------------------------------------
revno: 2474.1.49
revision-id: john at arbash-meinel.com-20070507211832-430v0s9bvjud3jeg
parent: john at arbash-meinel.com-20070507204345-plq5j2u2hfwm1q8v
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 16:18:32 -0500
message:
Add DirState.save() benchmarks.
At this point it doesn't seem a huge overhead
(857ms for 20k entries with 2 parents on a slow machine)
But something we might look into in the future
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
------------------------------------------------------------
revno: 2474.1.48
revision-id: john at arbash-meinel.com-20070507204345-plq5j2u2hfwm1q8v
parent: john at arbash-meinel.com-20070507203816-0zk28og5dadjdj4l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 15:43:45 -0500
message:
Just recording a benchmark on my fast machine
_read_dirblocks_20k_tree_0_parents_c OK 158ms/ 2632ms
_read_dirblocks_20k_tree_0_parents_py OK 247ms/ 2648ms
_read_dirblocks_20k_tree_1_parent_c OK 224ms/ 5493ms
_read_dirblocks_20k_tree_1_parent_py OK 324ms/ 5558ms
_read_dirblocks_20k_tree_2_parents_c OK 279ms/ 6675ms
_read_dirblocks_20k_tree_2_parents_py OK 435ms/ 6847ms
------------------------------------------------------------
revno: 2474.1.47
revision-id: john at arbash-meinel.com-20070507203816-0zk28og5dadjdj4l
parent: john at arbash-meinel.com-20070507202804-5w45ajlfp3xoc3kl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 15:38:16 -0500
message:
Change the names of the functions from c_foo and py_foo to foo_c and foo_py
This makes it easier to search for 'def foo*' and means that benchmark results
are next to eachother, rather than far apart.
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/compiled/test_dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
------------------------------------------------------------
revno: 2474.1.46
revision-id: john at arbash-meinel.com-20070507202804-5w45ajlfp3xoc3kl
parent: john at arbash-meinel.com-20070507191244-ywyxg0ftlh6n297f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 15:28:04 -0500
message:
Finish implementing _c_read_dirblocks for any number of parents.
bench_dirstate.BenchmarkDirState.test__c_read_dirblocks_20k_tree_0_parents OK 367ms/ 4353ms
bench_dirstate.BenchmarkDirState.test__c_read_dirblocks_20k_tree_1_parent OK 594ms/ 8958ms
bench_dirstate.BenchmarkDirState.test__c_read_dirblocks_20k_tree_2_parents OK 842ms/ 10490ms
bench_dirstate.BenchmarkDirState.test__py_read_dirblocks_20k_tree_0_parents OK 560ms/ 4298ms
bench_dirstate.BenchmarkDirState.test__py_read_dirblocks_20k_tree_1_parent OK 692ms/ 8658ms
bench_dirstate.BenchmarkDirState.test__py_read_dirblocks_20k_tree_2_parents OK 1006ms/ 10710ms
So overall the performance benefit is about 15-30%
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.45
revision-id: john at arbash-meinel.com-20070507191244-ywyxg0ftlh6n297f
parent: john at arbash-meinel.com-20070507183155-fzs5z1516gyf5lth
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 14:12:44 -0500
message:
Add benchmarks to see how reading the dirstate changes when you have parents.
Currently, the C implementation is slower than python, but partially that is
because it is not optimized (at all).
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
------------------------------------------------------------
revno: 2474.1.44
revision-id: john at arbash-meinel.com-20070507183155-fzs5z1516gyf5lth
parent: john at arbash-meinel.com-20070507182449-mm860vvdw9keyfx5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 13:31:55 -0500
message:
Use cmp_by_dirs in _iter_changes, it saves a bit of time.
When I initially wrote it, I thought they wouldn't be called often,
but I realize now they are evaluated when we have unknown/ignored files
on disk.
modified:
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2474.1.43
revision-id: john at arbash-meinel.com-20070507182449-mm860vvdw9keyfx5
parent: john at arbash-meinel.com-20070507180840-e0r1jomaos7an93j
parent: pqm at pqm.ubuntu.com-20070507175017-mvwcdqzq0w4z36lr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 13:24:49 -0500
message:
[merge] bzr.dev 2483
added:
doc/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
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/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/default.css default.css-20060622101119-tgwtdci8z769bjb9-1
------------------------------------------------------------
revno: 2474.1.42
revision-id: john at arbash-meinel.com-20070507180840-e0r1jomaos7an93j
parent: john at arbash-meinel.com-20070507175701-b8c87exjybq31evq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 13:08:40 -0500
message:
fix benchmark names, refactor to avoid 'create_path_names' overhead.
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
------------------------------------------------------------
revno: 2474.1.41
revision-id: john at arbash-meinel.com-20070507175701-b8c87exjybq31evq
parent: john at arbash-meinel.com-20070505132458-0fe0g2jfdoyg95mn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Mon 2007-05-07 12:57:01 -0500
message:
Change the name of cmp_dirblock_strings to cmp_by_dirs
And refactor the test cases so that we test both the python version and the
C version. Also, add benchmarks for both.
It shows that the C version is approx 10x faster.
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/compiled/test_dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
------------------------------------------------------------
revno: 2474.1.40
revision-id: john at arbash-meinel.com-20070505132458-0fe0g2jfdoyg95mn
parent: john at arbash-meinel.com-20070505050202-hmi7l9smckjrf2pa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Sat 2007-05-05 08:24:58 -0500
message:
(python-only) Shave a bit of time off by calling binascii.b2a_base64
I should have looked closer, base64.encodestring() is a Legacy api, which
just wraps binascii.b2a_base64.
On 21k pack_stat calls, it drops us from around 784ms to 281ms
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
------------------------------------------------------------
revno: 2474.1.39
revision-id: john at arbash-meinel.com-20070505050202-hmi7l9smckjrf2pa
parent: john at arbash-meinel.com-20070505045753-1fwhap6q0jyb18vt
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Sat 2007-05-05 00:02:02 -0500
message:
Clean up and remove unused functions.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.38
revision-id: john at arbash-meinel.com-20070505045753-1fwhap6q0jyb18vt
parent: john at arbash-meinel.com-20070505043606-lw7bjxwzcnjbls9v
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 23:57:53 -0500
message:
Finally, faster than text.split() (156ms)
By iterating over the fields directly, we don't have to create Python strings
for the dirname field (only when it changes), or for the size field or is_executable
fields.
A lot fewer python objects means faster parsing.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.37
revision-id: john at arbash-meinel.com-20070505043606-lw7bjxwzcnjbls9v
parent: john at arbash-meinel.com-20070505015422-9dfed0e9uza2g7n9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 23:36:06 -0500
message:
get_next() returns the length of the string,
preparing for having a _get_entry... which parses rather than
extracting to a list first
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.36
revision-id: john at arbash-meinel.com-20070505015422-9dfed0e9uza2g7n9
parent: john at arbash-meinel.com-20070504223428-d7vwvp3f7ypn9ivv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 20:54:22 -0500
message:
Move functions into member functions on reader() class.
Drops time down to 212ms
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.35
revision-id: john at arbash-meinel.com-20070504223428-d7vwvp3f7ypn9ivv
parent: john at arbash-meinel.com-20070504222904-6f6i8yxr9qpf8lpw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 17:34:28 -0500
message:
Read the entries one at a time, rather than all at the beginning.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.34
revision-id: john at arbash-meinel.com-20070504222904-6f6i8yxr9qpf8lpw
parent: john at arbash-meinel.com-20070504221204-d9mjz2nl8fd5maxp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 17:29:04 -0500
message:
Delay reading fields until in parse loop
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.33
revision-id: john at arbash-meinel.com-20070504221204-d9mjz2nl8fd5maxp
parent: john at arbash-meinel.com-20070504220621-iwla6gmrtx7iy37s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 17:12:04 -0500
message:
Using text.split() is down to 174ms
We'll need some work to get the Reader version faster.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.32
revision-id: john at arbash-meinel.com-20070504220621-iwla6gmrtx7iy37s
parent: john at arbash-meinel.com-20070504214853-iqaht2z8963hdlr3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 17:06:21 -0500
message:
Skip past the first entry while reading,
rather than while processing.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.31
revision-id: john at arbash-meinel.com-20070504214853-iqaht2z8963hdlr3
parent: john at arbash-meinel.com-20070504214147-ckrxzu7bepvcs4ct
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 16:48:53 -0500
message:
Avoiding the string format unless there is actually a problem
saves us almost 50ms (down to 242ms)
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.30
revision-id: john at arbash-meinel.com-20070504214147-ckrxzu7bepvcs4ct
parent: john at arbash-meinel.com-20070504210438-cvtzgzh4xbad7kww
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 16:41:47 -0500
message:
Start working towards a parser which uses a Reader (producer)
rather than working on a list of fields. Currently slower than text.split('\0'),
but should be possible to avoid the intermediate list entirely.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.29
revision-id: john at arbash-meinel.com-20070504210438-cvtzgzh4xbad7kww
parent: john at arbash-meinel.com-20070504200015-yli1te8jfhk3xpjc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 16:04:38 -0500
message:
Refactor, so that the inner _fields_to_entries function is the
doing the path comparison, and it will re-use the dirname object,
rather than copying a new string each time.
This should have equivalent performance, but have a rather large
memory savings, because we don't maintain N copies of the dirname
for N files in that directory.
It (theoretically) will speed up some comparisons, too,
because the string hash, etc, will be properly cached.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.28
revision-id: john at arbash-meinel.com-20070504200015-yli1te8jfhk3xpjc
parent: john at arbash-meinel.com-20070504194612-ryl2chfi4dd53c2h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 15:00:15 -0500
message:
Ask the field converter to determine the current directory
rather than parsing it out of the returned entry.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.27
revision-id: john at arbash-meinel.com-20070504194612-ryl2chfi4dd53c2h
parent: john at arbash-meinel.com-20070504192637-1tzys0ugbgy21fw9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 14:46:12 -0500
message:
Switching to direct access of members of the list drops us down to 305ms
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.26
revision-id: john at arbash-meinel.com-20070504192637-1tzys0ugbgy21fw9
parent: john at arbash-meinel.com-20070504192326-5f9kzev4v57if01r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 14:26:37 -0500
message:
Switch to using an offset rather than doing a list splice
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.25
revision-id: john at arbash-meinel.com-20070504192326-5f9kzev4v57if01r
parent: john at arbash-meinel.com-20070504190500-tq5wvnhmmd30m21y
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 14:23:26 -0500
message:
Refactor into a helper function to make implementation clearer
This also improves performance to 319ms
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.24
revision-id: john at arbash-meinel.com-20070504190500-tq5wvnhmmd30m21y
parent: john at arbash-meinel.com-20070504185936-1mjdoqmtz74xe5mg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 14:05:00 -0500
message:
Unrolling into a direct loop drops us to 326ms
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.23
revision-id: john at arbash-meinel.com-20070504185936-1mjdoqmtz74xe5mg
parent: john at arbash-meinel.com-20070504181128-422svqlutnl3v43d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 13:59:36 -0500
message:
A C implementation of _fields_to_entry_0_parents drops the time from 400ms to 330ms for a 21k-entry tree
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
------------------------------------------------------------
revno: 2474.1.22
revision-id: john at arbash-meinel.com-20070504181128-422svqlutnl3v43d
parent: john at arbash-meinel.com-20070504180557-iaitatth56jygggl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 13:11:28 -0500
message:
Do the same renaming => py_ and c_ for _read_dirblocks
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
------------------------------------------------------------
revno: 2474.1.21
revision-id: john at arbash-meinel.com-20070504180557-iaitatth56jygggl
parent: john at arbash-meinel.com-20070504174616-4kdi7zi32h7ev4f9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 13:05:57 -0500
message:
Cleanup the multiple testing.
Change the function names from both being 'bisect_dirblocks' to being
py_bisect_dirblocks and c_bisect_dirblocks.
And enable using the compiled form when it is available.
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/compiled/test_dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
------------------------------------------------------------
revno: 2474.1.20
revision-id: john at arbash-meinel.com-20070504174616-4kdi7zi32h7ev4f9
parent: john at arbash-meinel.com-20070504173600-5reyrpo013nk17sr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 12:46:16 -0500
message:
Apply all of the tests for DirState.bisect_dirblock to the compiled function.
modified:
bzrlib/tests/compiled/test_dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
------------------------------------------------------------
revno: 2474.1.19
revision-id: john at arbash-meinel.com-20070504173600-5reyrpo013nk17sr
parent: john at arbash-meinel.com-20070504163523-69dypgt24ipo26p2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 12:36:00 -0500
message:
Clean up _cmp_dirblock_strings_alt to make it the default.
This improves bisect_dirblock_compiled by another 2x.
So far the improvement is now 800ms => 100ms => 50ms with the current
function.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.18
revision-id: john at arbash-meinel.com-20070504163523-69dypgt24ipo26p2
parent: john at arbash-meinel.com-20070504161941-7n3we92jhxnczl5a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 11:35:23 -0500
message:
Add an integer-size comparison loop at the begining, and
update the test suite to make sure we are properly exercising it.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/tests/compiled/test_dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
------------------------------------------------------------
revno: 2474.1.17
revision-id: john at arbash-meinel.com-20070504161941-7n3we92jhxnczl5a
parent: john at arbash-meinel.com-20070504161120-wyplkl21ctqbq2ka
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 11:19:41 -0500
message:
Using a custom loop seems to be the same speed, but is probably
easier to understand.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.16
revision-id: john at arbash-meinel.com-20070504161120-wyplkl21ctqbq2ka
parent: john at arbash-meinel.com-20070504160330-jai9q6h8ts1ddb2i
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 11:11:20 -0500
message:
Shave off maybe 10% by using the PyString_* macros instead of functions.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.15
revision-id: john at arbash-meinel.com-20070504160330-jai9q6h8ts1ddb2i
parent: john at arbash-meinel.com-20070504160216-v19b36wj16g0awwi
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 11:03:30 -0500
message:
No need to benchmark bisect_dirblock_compiled_cached
The cache isn't used in the compiled form.
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
------------------------------------------------------------
revno: 2474.1.14
revision-id: john at arbash-meinel.com-20070504160216-v19b36wj16g0awwi
parent: john at arbash-meinel.com-20070504155015-l31mrfviixrrf277
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 11:02:16 -0500
message:
Switching bisect_dirblocks remove the extra .split('/')
This is a massive improvement (approx 8x).
Since we avoid all the temporary lists, dictionary lookups etc.
Now we just have a custom string comparison, which is quite fast.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.13
revision-id: john at arbash-meinel.com-20070504155015-l31mrfviixrrf277
parent: john at arbash-meinel.com-20070504154346-fgz2nrtwtd8u9w6a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 10:50:15 -0500
message:
Now that we have bisect_dirblock working again, bring back cmp_dirblock_strings.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.12
revision-id: john at arbash-meinel.com-20070504154346-fgz2nrtwtd8u9w6a
parent: john at arbash-meinel.com-20070504044714-xgbrxg27p83yis89
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Fri 2007-05-04 10:43:46 -0500
message:
Clean up bisect_dirstate to not use temporary variables.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.11
revision-id: john at arbash-meinel.com-20070504044714-xgbrxg27p83yis89
parent: john at arbash-meinel.com-20070504043751-5unx865kqw9scyyu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-05-03 23:47:14 -0500
message:
Avoid a Py_INCREF by using a void *
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.10
revision-id: john at arbash-meinel.com-20070504043751-5unx865kqw9scyyu
parent: john at arbash-meinel.com-20070504041902-r5vxd4xpkduhbd0b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-05-03 23:37:51 -0500
message:
Explicitly calling Py_INCREF makes things happier again.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.9
revision-id: john at arbash-meinel.com-20070504041902-r5vxd4xpkduhbd0b
parent: john at arbash-meinel.com-20070504041242-lnhinwkv7wvsejg0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-05-03 23:19:02 -0500
message:
Revert the pyrex implementation to its most basic
The fancier ones were causing segfaults.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.8
revision-id: john at arbash-meinel.com-20070504041242-lnhinwkv7wvsejg0
parent: john at arbash-meinel.com-20070504035829-orbif7nnkim9md1t
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-05-03 23:12:42 -0500
message:
Fix the benchmarks to test what I thought I was testing earlier
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
------------------------------------------------------------
revno: 2474.1.7
revision-id: john at arbash-meinel.com-20070504035829-orbif7nnkim9md1t
parent: john at arbash-meinel.com-20070503234531-xt0tpuxwqgjn10l8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-05-03 22:58:29 -0500
message:
Add some tests for a helper function that lets us
compare 2 paths in 'dirblock' mode, without splitting the strings.
added:
bzrlib/tests/compiled/ bzrlibtestscompiled-20070504021933-pn9n1zh8fkzcr2z1-1
bzrlib/tests/compiled/__init__.py __init__.py-20070504035751-jsbn00xodv0y1eve-1
bzrlib/tests/compiled/test_dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2474.1.6
revision-id: john at arbash-meinel.com-20070503234531-xt0tpuxwqgjn10l8
parent: john at arbash-meinel.com-20070503234105-xwv4fcxn26d97d6u
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-05-03 18:45:31 -0500
message:
use 10x the directories to make the timing to fall in the 1s mark
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
------------------------------------------------------------
revno: 2474.1.5
revision-id: john at arbash-meinel.com-20070503234105-xwv4fcxn26d97d6u
parent: john at arbash-meinel.com-20070503233549-445n015iomhc8ppm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-05-03 18:41:05 -0500
message:
Implement explicit handling of the no-cache version, which is even faster.
modified:
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.4
revision-id: john at arbash-meinel.com-20070503233549-445n015iomhc8ppm
parent: john at arbash-meinel.com-20070503233314-btj1vbd2qtod34kq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-05-03 18:35:49 -0500
message:
Add benchmarks for dirstate.bisect_dirblocks, and implement bisect_dirblocks in pyrex.
Shows about a 2x performance improvement being in compiled C.
Also, at least on my Mac, it is faster without extra caching.
modified:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
------------------------------------------------------------
revno: 2474.1.3
revision-id: john at arbash-meinel.com-20070503233314-btj1vbd2qtod34kq
parent: john at arbash-meinel.com-20070503211741-b51wshh2i5ecw50i
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-05-03 18:33:14 -0500
message:
remove the .c file for now, so it doesn't clutter things
removed:
bzrlib/compiled/dirstate_helpers.c dirstate_helpers.c-20070503201057-u425eni465q4idwn-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
------------------------------------------------------------
revno: 2474.1.2
revision-id: john at arbash-meinel.com-20070503211741-b51wshh2i5ecw50i
parent: john at arbash-meinel.com-20070503201137-qiijh6rvjo9p14wy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-05-03 16:17:41 -0500
message:
Add benchmark tests for a couple DirState functions.
added:
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
modified:
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
------------------------------------------------------------
revno: 2474.1.1
revision-id: john at arbash-meinel.com-20070503201137-qiijh6rvjo9p14wy
parent: pqm at pqm.ubuntu.com-20070430223205-x4uyrteryh0230fp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_pyrex
timestamp: Thu 2007-05-03 15:11:37 -0500
message:
Create a Pyrex extension for reading the dirstate file.
added:
bzrlib/compiled/ bzrlibcompiled-20070503195935-dmd5sxtc930u4p37-1
bzrlib/compiled/__init__.py __init__.py-20070503201057-u425eni465q4idwn-1
bzrlib/compiled/dirstate_helpers.c dirstate_helpers.c-20070503201057-u425eni465q4idwn-2
bzrlib/compiled/dirstate_helpers.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2625.1.17
revision-id: pqm at pqm.ubuntu.com-20070720172520-i2ezksmrduaonojd
parent: pqm at pqm.ubuntu.com-20070720161548-nppg3mvd38gbuaid
parent: fullermd at over-yonder.net-20070720084335-cdh2julh67xm0jzu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-07-20 18:25:20 +0100
message:
(Matthew Fuller) Fix URL to built copy of HACKING (bug #109149)
modified:
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2625.8.1
revision-id: fullermd at over-yonder.net-20070720084335-cdh2julh67xm0jzu
parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: hacking
timestamp: Fri 2007-07-20 03:43:35 -0500
message:
Fix URL to built copy of HACKING.
modified:
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2625.1.16
revision-id: pqm at pqm.ubuntu.com-20070720161548-nppg3mvd38gbuaid
parent: pqm at pqm.ubuntu.com-20070720151346-fhgw7wgtkuc1fdvj
parent: john at arbash-meinel.com-20070720144248-6qltqb2tkm9x49lw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-07-20 17:15:48 +0100
message:
(John Arbash Meinel) Small updates for EmailMessage for python2.5 compatibility
modified:
bzrlib/email_message.py email_message.py-20070718143823-660zfcl54xi1v65u-1
bzrlib/tests/test_email_message.py test_email_message.p-20070718143823-660zfcl54xi1v65u-2
------------------------------------------------------------
revno: 2625.1.14.1.2
revision-id: john at arbash-meinel.com-20070720144248-6qltqb2tkm9x49lw
parent: john at arbash-meinel.com-20070720142859-a24s0khul0yw91bh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-07-20 09:42:48 -0500
message:
Some cleanups for the EmailMessage class.
Remove self._msgobj as it can lead to reporting incorrect cached data.
Update tests for changes in python2.5, adding similar strings
into a dictionary, with one being unicode and the other string
causes a UnicodeWarning.
modified:
bzrlib/email_message.py email_message.py-20070718143823-660zfcl54xi1v65u-1
bzrlib/tests/test_email_message.py test_email_message.p-20070718143823-660zfcl54xi1v65u-2
------------------------------------------------------------
revno: 2625.1.15
revision-id: pqm at pqm.ubuntu.com-20070720151346-fhgw7wgtkuc1fdvj
parent: pqm at pqm.ubuntu.com-20070720133143-r74lo566tluurmfp
parent: john at arbash-meinel.com-20070720142859-a24s0khul0yw91bh
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-07-20 16:13:46 +0100
message:
(Adeodato Simó) EmailMessage class, allowing much nicer access to Email object than stdlib
added:
bzrlib/email_message.py email_message.py-20070718143823-660zfcl54xi1v65u-1
bzrlib/tests/test_email_message.py test_email_message.p-20070718143823-660zfcl54xi1v65u-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
------------------------------------------------------------
revno: 2625.1.14.1.1
revision-id: john at arbash-meinel.com-20070720142859-a24s0khul0yw91bh
parent: pqm at pqm.ubuntu.com-20070720133143-r74lo566tluurmfp
parent: dato at net.com.org.es-20070719212253-iaqokj16w681svwe
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2007-07-20 09:28:59 -0500
message:
(Adeodato Simó) EmailMessage class, allowing much nicer access to Email object than stdlib
added:
bzrlib/email_message.py email_message.py-20070718143823-660zfcl54xi1v65u-1
bzrlib/tests/test_email_message.py test_email_message.p-20070718143823-660zfcl54xi1v65u-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
------------------------------------------------------------
revno: 2625.7.3
revision-id: dato at net.com.org.es-20070719212253-iaqokj16w681svwe
parent: dato at net.com.org.es-20070719173843-m4080de2g08tt3th
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.email_message
timestamp: Thu 2007-07-19 23:22:53 +0200
message:
Changes after review by John.
* bzrlib/email_message.py:
(EmailMessage): inherit from object.
(EmailMessage.__getitem__): fix grammar in docstring.
* bzrlib/email_message.py,
bzrlib/tests/test_email_message.py:
Do not use variables named "string".
* bzrlib/tests/test_email_message.py:
(TestEmailMessage.test_send): do not assert inside the verify_*
functions that replace SMTPConnection.send_email. Instead, append the
received message to a local variable, and call assert in the main body
function.
modified:
bzrlib/email_message.py email_message.py-20070718143823-660zfcl54xi1v65u-1
bzrlib/tests/test_email_message.py test_email_message.p-20070718143823-660zfcl54xi1v65u-2
------------------------------------------------------------
revno: 2625.7.2
revision-id: dato at net.com.org.es-20070719173843-m4080de2g08tt3th
parent: dato at net.com.org.es-20070718155152-pv6rwq41eckqyxem
parent: pqm at pqm.ubuntu.com-20070719160934-d51fyijw69oto88p
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.email_message
timestamp: Thu 2007-07-19 19:38:43 +0200
message:
Merge bzr.dev, resolving conflicts and updating test_merge_directive.py.
removed:
bzrlib/bundle/common.py common.py-20050619223838-f25048f6638f04c6
bzrlib/bundle/old/ old-20051119041827-8f2417a9cc3b67f2
bzrlib/bundle/old/send_changeset.py send_changeset.py-20050628200204-9478d383946f1871
added:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
renamed:
bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
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_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2625.7.1
revision-id: dato at net.com.org.es-20070718155152-pv6rwq41eckqyxem
parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
committer: Adeodato Simó <dato at net.com.org.es>
branch nick: bzr.email_message
timestamp: Wed 2007-07-18 17:51:52 +0200
message:
New EmailMessage class, façade around email.Message and MIMEMultipart.
* bzrlib/email_message.py,
bzrlib/tests/test_email_message.py:
New files.
* bzrlib/tests/__init__.py:
(test_suite): add bzrlib.tests.test_email_message.
* bzrlib/merge_directive.py:
(MergeDirective.to_email): Use EmailMessage instead of email.Message.
* bzrlib/tests/test_merge_directive.py,
bzrlib/tests/blackbox/test_merge_directive.py:
(__main__): adjust EMAIL1 and EMAIL2 strings to how EmailMessage
formats itself.
* bzrlib/smtp_connection.py:
(SMTPConnection.get_message_addresses): do not use methods present in
email.Message but not in EmailMessage (get_all). Use get() instead of
__getitem__ to make explicit that None is returned if the header does
not exist.
* bzrlib/tests/test_smtp_connection.py:
(TestSMTPConnection.test_get_message_addresses,
TestSMTPConnection.test_destination_address_required): test the
functions against EmailMessage in addition to email.Message.
* NEWS:
Mention EmailMessage in INTERNALS.
added:
bzrlib/email_message.py email_message.py-20070718143823-660zfcl54xi1v65u-1
bzrlib/tests/test_email_message.py test_email_message.p-20070718143823-660zfcl54xi1v65u-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
------------------------------------------------------------
revno: 2625.1.14
revision-id: pqm at pqm.ubuntu.com-20070720133143-r74lo566tluurmfp
parent: pqm at pqm.ubuntu.com-20070720081024-5xhlp7r8ufwxt6nf
parent: abentley at panoramicfeedback.com-20070720125633-9wek52fpzqtatsfh
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-07-20 14:31:43 +0100
message:
fix annotate merge to not require Tree.get_weave
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.54
revision-id: abentley at panoramicfeedback.com-20070720125633-9wek52fpzqtatsfh
parent: abentley at panoramicfeedback.com-20070720124527-rlyrmhdnovpj8vz7
parent: pqm at pqm.ubuntu.com-20070720081024-5xhlp7r8ufwxt6nf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-07-20 08:56:33 -0400
message:
Merge bzr.dev
removed:
bzrlib/bundle/common.py common.py-20050619223838-f25048f6638f04c6
bzrlib/bundle/old/ old-20051119041827-8f2417a9cc3b67f2
bzrlib/bundle/old/send_changeset.py send_changeset.py-20050628200204-9478d383946f1871
added:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
bzrlib/transport/unlistable.py unlistable.py-20070714093417-5gc9d821to85zo4t-2
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
renamed:
bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
tools/capture_tree.py capture_tree.py-20051004100938-c7ff053182f5ae51
tools/rst2prettyhtml.py rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
tools/trace-revisions tracerevisions-20051107162041-9dfee0a7324d206d
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.53
revision-id: abentley at panoramicfeedback.com-20070720124527-rlyrmhdnovpj8vz7
parent: abentley at panoramicfeedback.com-20070719154417-gb6sri5503b1u89w
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-07-20 08:45:27 -0400
message:
Restore old method of adjusting partents
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.52
revision-id: abentley at panoramicfeedback.com-20070719154417-gb6sri5503b1u89w
parent: abentley at panoramicfeedback.com-20070717201334-xjv6yqp0zw0q16qs
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-07-19 11:44:17 -0400
message:
Tweak from review comments
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.51
revision-id: abentley at panoramicfeedback.com-20070717201334-xjv6yqp0zw0q16qs
parent: abentley at panoramicfeedback.com-20070717200413-jpganazttxzryrx8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-07-17 16:13:34 -0400
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.50
revision-id: abentley at panoramicfeedback.com-20070717200413-jpganazttxzryrx8
parent: abentley at panoramicfeedback.com-20070717200342-sq5gq5m9fwu1a5xu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-07-17 16:04:13 -0400
message:
Deprecate RevisionTree.get_weave
modified:
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.49
revision-id: abentley at panoramicfeedback.com-20070717200342-sq5gq5m9fwu1a5xu
parent: abentley at panoramicfeedback.com-20070717193816-e92ovxrfhq0st34d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-07-17 16:03:42 -0400
message:
fix deprecations in remerge
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.48
revision-id: abentley at panoramicfeedback.com-20070717193816-e92ovxrfhq0st34d
parent: abentley at panoramicfeedback.com-20070717191823-43x0n5d5hy6qd6sl
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-07-17 15:38:16 -0400
message:
Add tests for annotate and plan_merge
modified:
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.47
revision-id: abentley at panoramicfeedback.com-20070717191823-43x0n5d5hy6qd6sl
parent: abentley at panoramicfeedback.com-20070717182849-ffu3wxsll06lhc9a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-07-17 15:18:23 -0400
message:
Fix remerge --weave
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.46
revision-id: abentley at panoramicfeedback.com-20070717182849-ffu3wxsll06lhc9a
parent: abentley at panoramicfeedback.com-20070717174318-putlxtqf0b4op8d4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-07-17 14:28:49 -0400
message:
Move plan merge to tree
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.45
revision-id: abentley at panoramicfeedback.com-20070717174318-putlxtqf0b4op8d4
parent: aaron.bentley at utoronto.ca-20070711045443-oi9vk0jgepts5k5s
parent: pqm at pqm.ubuntu.com-20070717110203-zzmtp28nunhsoz12
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-07-17 13:43:18 -0400
message:
Merge from bzr.dev
added:
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/_knit_load_data_py.py _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
bzrlib/benchmarks/bench_knit.py bench_knit.py-20070509145850-pan5jnd3hl7mfdya-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/tests/blackbox/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-1
bzrlib/tests/repository_implementations/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/workingtree_implementations/test_uncommit.py test_uncommit.py-20070712063057-8zaprw7t7lcqxeje-1
bzrlib/util/tests/ bzrlibutiltests-20070713054332-wmm62qs3xvyfzwup-1
bzrlib/util/tests/__init__.py __init__.py-20070713054446-oliu3oth0gy08y0t-1
bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
doc/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/developers/diff.txt diff.txt-20070716233605-2q6jzorua7mr42jk-1
doc/developers/indices.txt indices.txt-20070713142939-m5cdnp31u8ape0td-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-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_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2625.1.13
revision-id: pqm at pqm.ubuntu.com-20070720081024-5xhlp7r8ufwxt6nf
parent: pqm at pqm.ubuntu.com-20070720065314-hhb0qw5h3cfe8mga
parent: ian.clatworthy at internode.on.net-20070720073321-ixduy2l3foudxjo6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-07-20 09:10:24 +0100
message:
(Kent Gibson) Update update's help
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2625.1.12.1.1
revision-id: ian.clatworthy at internode.on.net-20070720073321-ixduy2l3foudxjo6
parent: pqm at pqm.ubuntu.com-20070720065314-hhb0qw5h3cfe8mga
parent: d.m.watkins at warwick.ac.uk-20070718195719-o26y563mnt5t5704
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Fri 2007-07-20 17:33:21 +1000
message:
(Kent Gibson) Update update's help
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2625.6.1
revision-id: d.m.watkins at warwick.ac.uk-20070718195719-o26y563mnt5t5704
parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: update-help
timestamp: Wed 2007-07-18 20:57:19 +0100
message:
'bzr update's help now includes a see also reference to 'help status-flags'.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2625.1.12
revision-id: pqm at pqm.ubuntu.com-20070720065314-hhb0qw5h3cfe8mga
parent: pqm at pqm.ubuntu.com-20070720054555-bffj18ybejmgiv50
parent: ian.clatworthy at internode.on.net-20070720060924-du7j6i4gryqin95k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-07-20 07:53:14 +0100
message:
(Ian Clatworthy) Deprecate old fns that use InventoryEntry methods that ought to go
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 2625.1.11.1.1
revision-id: ian.clatworthy at internode.on.net-20070720060924-du7j6i4gryqin95k
parent: pqm at pqm.ubuntu.com-20070720054555-bffj18ybejmgiv50
parent: ian.clatworthy at internode.on.net-20070720050632-ee61b1maehkxrcmh
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Fri 2007-07-20 16:09:24 +1000
message:
(Ian Clatworthy) Deprecate old fns that use InventoryEntry methods that ought to go
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 2625.5.3
revision-id: ian.clatworthy at internode.on.net-20070720050632-ee61b1maehkxrcmh
parent: ian.clatworthy at internode.on.net-20070719065835-b2hd6o94wud54kzs
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.nuke-change_entry
timestamp: Fri 2007-07-20 15:06:32 +1000
message:
Add a test to ensure the deprecation worked.
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 2625.5.2
revision-id: ian.clatworthy at internode.on.net-20070719065835-b2hd6o94wud54kzs
parent: ian.clatworthy at internode.on.net-20070718071053-bfvsmb0dcs9ibi4p
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.nuke-change_entry
timestamp: Thu 2007-07-19 16:58:35 +1000
message:
Incorporate feedback from jameinel
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 2625.5.1
revision-id: ian.clatworthy at internode.on.net-20070718071053-bfvsmb0dcs9ibi4p
parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.nuke-change_entry
timestamp: Wed 2007-07-18 17:10:53 +1000
message:
Deprecate old fns that use InventoryEntry methods that ought to go
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 2625.1.11
revision-id: pqm at pqm.ubuntu.com-20070720054555-bffj18ybejmgiv50
parent: pqm at pqm.ubuntu.com-20070720035545-uh4yjypen2ux6z8s
parent: ian.clatworthy at internode.on.net-20070720041438-bxsgat12jjuc2pi2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-07-20 06:45:55 +0100
message:
(Ian Clatworthy) Clarify use of underscores in HACKING
modified:
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2625.1.10.1.1
revision-id: ian.clatworthy at internode.on.net-20070720041438-bxsgat12jjuc2pi2
parent: pqm at pqm.ubuntu.com-20070720035545-uh4yjypen2ux6z8s
parent: ian.clatworthy at internode.on.net-20070718063828-us15mjk42ixk3rfy
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Fri 2007-07-20 14:14:38 +1000
message:
(Ian Clatworthy) Clarify use of underscores in HACKING
modified:
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2625.4.1
revision-id: ian.clatworthy at internode.on.net-20070718063828-us15mjk42ixk3rfy
parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.HACKING-visibility
timestamp: Wed 2007-07-18 16:38:28 +1000
message:
Clarify the use of underscore in the naming convention
modified:
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2625.1.10
revision-id: pqm at pqm.ubuntu.com-20070720035545-uh4yjypen2ux6z8s
parent: pqm at pqm.ubuntu.com-20070720015347-eaeqmggngaemmbde
parent: robertc at robertcollins.net-20070720032020-xiftpb5gqeebo861
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-07-20 04:55:45 +0100
message:
(robertc) Reinstate the accidentally backed out external_url patch.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2625.1.9.1.1
revision-id: robertc at robertcollins.net-20070720032020-xiftpb5gqeebo861
parent: pqm at pqm.ubuntu.com-20070720015347-eaeqmggngaemmbde
parent: pqm at pqm.ubuntu.com-20070705224207-7pslqt12ofh4vnzx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2007-07-20 13:20:20 +1000
message:
(robertc) Reinstate the accidentally backed out external_url patch.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2625.1.9
revision-id: pqm at pqm.ubuntu.com-20070720015347-eaeqmggngaemmbde
parent: pqm at pqm.ubuntu.com-20070719224856-pv0v2n7tmgpypfmf
parent: robertc at robertcollins.net-20070720005841-xnu6um6vx0n41h0k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-07-20 02:53:47 +0100
message:
(robertc) Add FileNames a managed collection of names to get file-discovery without transport listing.
added:
bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
bzrlib/transport/unlistable.py unlistable.py-20070714093417-5gc9d821to85zo4t-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2617.4.8
revision-id: robertc at robertcollins.net-20070720005841-xnu6um6vx0n41h0k
parent: robertc at robertcollins.net-20070720005743-1s083l5cvp9823nj
parent: pqm at pqm.ubuntu.com-20070719224856-pv0v2n7tmgpypfmf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: file-collection
timestamp: Fri 2007-07-20 10:58:41 +1000
message:
Merge bzr.dev.
removed:
bzrlib/bundle/common.py common.py-20050619223838-f25048f6638f04c6
bzrlib/bundle/old/ old-20051119041827-8f2417a9cc3b67f2
bzrlib/bundle/old/send_changeset.py send_changeset.py-20050628200204-9478d383946f1871
added:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
bzrlib/util/tests/ bzrlibutiltests-20070713054332-wmm62qs3xvyfzwup-1
bzrlib/util/tests/__init__.py __init__.py-20070713054446-oliu3oth0gy08y0t-1
bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
doc/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
doc/developers/diff.txt diff.txt-20070716233605-2q6jzorua7mr42jk-1
doc/developers/indices.txt indices.txt-20070713142939-m5cdnp31u8ape0td-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
renamed:
bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/capture_tree.py capture_tree.py-20051004100938-c7ff053182f5ae51
tools/rst2prettyhtml.py rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
tools/trace-revisions tracerevisions-20051107162041-9dfee0a7324d206d
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2617.4.7
revision-id: robertc at robertcollins.net-20070720005743-1s083l5cvp9823nj
parent: robertc at robertcollins.net-20070719064046-3mbyfeb6ioaw4htk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: file-collection
timestamp: Fri 2007-07-20 10:57:43 +1000
message:
Tweak docstrings after over-aggressive search n replace.
modified:
bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
------------------------------------------------------------
revno: 2617.4.6
revision-id: robertc at robertcollins.net-20070719064046-3mbyfeb6ioaw4htk
parent: robertc at robertcollins.net-20070719063913-l1afgl876zpaysf4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: file-collection
timestamp: Thu 2007-07-19 16:40:46 +1000
message:
self._names.discard wins over conditional remove - thanks Aaron.
modified:
bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
------------------------------------------------------------
revno: 2617.4.5
revision-id: robertc at robertcollins.net-20070719063913-l1afgl876zpaysf4
parent: robertc at robertcollins.net-20070719033717-2ajc3s1ua9wq2a9k
committer: Robert Collins <robertc at robertcollins.net>
branch nick: file-collection
timestamp: Thu 2007-07-19 16:39:13 +1000
message:
Reinstate the fakenfs+ decorator registration.
modified:
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2617.4.4
revision-id: robertc at robertcollins.net-20070719033717-2ajc3s1ua9wq2a9k
parent: robertc at robertcollins.net-20070714101338-eu0cblg5ds2q2him
committer: Robert Collins <robertc at robertcollins.net>
branch nick: file-collection
timestamp: Thu 2007-07-19 13:37:17 +1000
message:
Rename to FileNames as per review.
renamed:
bzrlib/file_collection.py => bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
bzrlib/tests/test_file_collection.py => bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
------------------------------------------------------------
revno: 2617.4.3
revision-id: robertc at robertcollins.net-20070714101338-eu0cblg5ds2q2him
parent: robertc at robertcollins.net-20070714100801-bo0gezkinkusmtr3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: file-collection
timestamp: Sat 2007-07-14 20:13:38 +1000
message:
Check loading empty collections and support removing items.
modified:
bzrlib/file_collection.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
bzrlib/tests/test_file_collection.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
------------------------------------------------------------
revno: 2617.4.2
revision-id: robertc at robertcollins.net-20070714100801-bo0gezkinkusmtr3
parent: robertc at robertcollins.net-20070714093531-n1kt1ch73qxhfw8i
committer: Robert Collins <robertc at robertcollins.net>
branch nick: file-collection
timestamp: Sat 2007-07-14 20:08:01 +1000
message:
Add FileCollection support class.
added:
bzrlib/file_collection.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
bzrlib/tests/test_file_collection.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2617.4.1
revision-id: robertc at robertcollins.net-20070714093531-n1kt1ch73qxhfw8i
parent: pqm at pqm.ubuntu.com-20070713074627-93zxs9uh528y0fki
committer: Robert Collins <robertc at robertcollins.net>
branch nick: file-collection
timestamp: Sat 2007-07-14 19:35:31 +1000
message:
Add a new transport decorator unlistable+ for testing.
added:
bzrlib/transport/unlistable.py unlistable.py-20070714093417-5gc9d821to85zo4t-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
------------------------------------------------------------
revno: 2625.1.8
revision-id: pqm at pqm.ubuntu.com-20070719224856-pv0v2n7tmgpypfmf
parent: pqm at pqm.ubuntu.com-20070719202307-rr3ky8d16z5v7h3e
parent: abentley at panoramicfeedback.com-20070719194243-y0x195iuvhzofujf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 23:48:56 +0100
message:
Disable timing-sensitive test
modified:
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
revno: 2625.1.6.1.1
revision-id: abentley at panoramicfeedback.com-20070719194243-y0x195iuvhzofujf
parent: pqm at pqm.ubuntu.com-20070719160934-d51fyijw69oto88p
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: timing-fix
timestamp: Thu 2007-07-19 15:42:43 -0400
message:
Disable timing-sensitive test
modified:
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
revno: 2625.1.7
revision-id: pqm at pqm.ubuntu.com-20070719202307-rr3ky8d16z5v7h3e
parent: pqm at pqm.ubuntu.com-20070719160934-d51fyijw69oto88p
parent: abentley at panoramicfeedback.com-20070719181611-etp4itjrl2tci9kl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 21:23:07 +0100
message:
Fix format strings
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.136
revision-id: abentley at panoramicfeedback.com-20070719181611-etp4itjrl2tci9kl
parent: abentley at panoramicfeedback.com-20070719150323-o7nd8emdqg44hj66
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-07-19 14:16:11 -0400
message:
Fix format strings
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2625.1.6
revision-id: pqm at pqm.ubuntu.com-20070719160934-d51fyijw69oto88p
parent: pqm at pqm.ubuntu.com-20070719081031-069ugi2mfg8accj1
parent: abentley at panoramicfeedback.com-20070719150323-o7nd8emdqg44hj66
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 17:09:34 +0100
message:
Add new bundle and merge-directive formats
removed:
bzrlib/bundle/common.py common.py-20050619223838-f25048f6638f04c6
bzrlib/bundle/old/ old-20051119041827-8f2417a9cc3b67f2
bzrlib/bundle/old/send_changeset.py send_changeset.py-20050628200204-9478d383946f1871
added:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
renamed:
bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
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_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2520.4.135
revision-id: abentley at panoramicfeedback.com-20070719150323-o7nd8emdqg44hj66
parent: abentley at panoramicfeedback.com-20070719131306-slidf7rax5xqiao8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-07-19 11:03:23 -0400
message:
Fix option grammar
modified:
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 2520.4.134
revision-id: abentley at panoramicfeedback.com-20070719131306-slidf7rax5xqiao8
parent: abentley at panoramicfeedback.com-20070719125158-0nmu7r2asga2iswq
parent: pqm at pqm.ubuntu.com-20070719081031-069ugi2mfg8accj1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-07-19 09:13:06 -0400
message:
Merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
tools/capture_tree.py capture_tree.py-20051004100938-c7ff053182f5ae51
tools/rst2prettyhtml.py rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
tools/trace-revisions tracerevisions-20051107162041-9dfee0a7324d206d
------------------------------------------------------------
revno: 2520.4.133
revision-id: abentley at panoramicfeedback.com-20070719125158-0nmu7r2asga2iswq
parent: abentley at panoramicfeedback.com-20070717132714-tmzx9khmg9501k51
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-07-19 08:51:58 -0400
message:
update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2520.4.132
revision-id: abentley at panoramicfeedback.com-20070717132714-tmzx9khmg9501k51
parent: aaron.bentley at utoronto.ca-20070705001717-xvjziyhsvaehxz01
parent: pqm at pqm.ubuntu.com-20070717110203-zzmtp28nunhsoz12
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-17 09:27:14 -0400
message:
Merge from bzr.dev
added:
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/_knit_load_data_py.py _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
bzrlib/benchmarks/bench_knit.py bench_knit.py-20070509145850-pan5jnd3hl7mfdya-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/tests/blackbox/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-1
bzrlib/tests/repository_implementations/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/workingtree_implementations/test_uncommit.py test_uncommit.py-20070712063057-8zaprw7t7lcqxeje-1
bzrlib/util/tests/ bzrlibutiltests-20070713054332-wmm62qs3xvyfzwup-1
bzrlib/util/tests/__init__.py __init__.py-20070713054446-oliu3oth0gy08y0t-1
bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
doc/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/developers/diff.txt diff.txt-20070716233605-2q6jzorua7mr42jk-1
doc/developers/indices.txt indices.txt-20070713142939-m5cdnp31u8ape0td-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_aliases.py test_aliases.py-20060210230318-f0c08c9294dbfae1
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
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_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_inventory.py test_inventory.py-20060921205529-9rwo2222xhm8edti-1
bzrlib/tests/blackbox/test_join.py test_join.py-20060928210902-95dkqa6boh8uq92b-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_logformats.py test_logformats.py-20060216104208-ba5a16c83480b7e4
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_lsprof.py test_lsprof.py-20070622025641-nbsm2svy8anvj9df-1
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_remerge.py test_remerge.py-20060629162739-o9m3s6143v8jnr2y-1
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_revno.py test_revno.py-20051204214528-2f0bf83a71b7656a
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_sign_my_commits.py test_sign_my_commits.py-20060215152957-270238a1ffacc841
bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_testament.py test_testament.py-20060816161839-snq405g3jk15gpax-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/blackbox/test_whoami.py test_whoami.py-20060629025641-8h3m2ch7kutqx7ug-1
bzrlib/tests/branch_implementations/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2520.4.131
revision-id: aaron.bentley at utoronto.ca-20070705001717-xvjziyhsvaehxz01
parent: aaron.bentley at utoronto.ca-20070705001520-svwjlw61uiuuwjhk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-07-04 20:17:17 -0400
message:
Raise BadBundle for records with wrong number of names
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.130
revision-id: aaron.bentley at utoronto.ca-20070705001520-svwjlw61uiuuwjhk
parent: aaron.bentley at utoronto.ca-20070704233826-jkp63376wi1n96mm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-07-04 20:15:20 -0400
message:
Finish tweaking decode_name
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.129
revision-id: aaron.bentley at utoronto.ca-20070704233826-jkp63376wi1n96mm
parent: aaron.bentley at utoronto.ca-20070704230126-gnzpm21043uxugxz
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-07-04 19:38:26 -0400
message:
update docs
modified:
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
------------------------------------------------------------
revno: 2520.4.128
revision-id: aaron.bentley at utoronto.ca-20070704230126-gnzpm21043uxugxz
parent: aaron.bentley at utoronto.ca-20070704224926-ic3z6noh9jaojw3l
parent: pqm at pqm.ubuntu.com-20070704204059-a1x9jomep52m9arn
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-07-04 19:01:26 -0400
message:
Merge bzr.dev
added:
bzrlib/transport/brokenrename.py brokenrename.py-20070628050843-mbwebk50srn93rut-1
doc/developers/status.txt status.txt-20070702023117-6xss29lx170qndwr-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/generate_ids.py generate_ids.py-20061102205935-z3do15ipw6m7v26u-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/strace.py strace.py-20070323001526-6zquhhw8leb9m6j8-1
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_strace.py test_strace.py-20070323001526-6zquhhw8leb9m6j8-2
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 2520.4.127
revision-id: aaron.bentley at utoronto.ca-20070704224926-ic3z6noh9jaojw3l
parent: aaron.bentley at utoronto.ca-20070704041136-g6rsq0ouz11jrcri
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-07-04 18:49:26 -0400
message:
Fix up name encoding to handle revision-ids with slashes
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.126
revision-id: aaron.bentley at utoronto.ca-20070704041136-g6rsq0ouz11jrcri
parent: aaron.bentley at utoronto.ca-20070704035807-xjnc9nztgfdbonqp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-07-04 00:11:36 -0400
message:
Add more docs
modified:
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.125
revision-id: aaron.bentley at utoronto.ca-20070704035807-xjnc9nztgfdbonqp
parent: aaron.bentley at utoronto.ca-20070704033828-h1r2ppit8hrjvvtt
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 23:58:07 -0400
message:
Hide multi-parent testing commands
modified:
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 2520.4.124
revision-id: aaron.bentley at utoronto.ca-20070704033828-h1r2ppit8hrjvvtt
parent: aaron.bentley at utoronto.ca-20070704030846-jazbwllok1798atc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 23:38:28 -0400
message:
Add docs to multiparent.py
modified:
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 2520.4.123
revision-id: aaron.bentley at utoronto.ca-20070704030846-jazbwllok1798atc
parent: aaron.bentley at utoronto.ca-20070704011821-g7a8znh40gfvg2og
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 23:08:46 -0400
message:
Cleanup of bundle code
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.122
revision-id: aaron.bentley at utoronto.ca-20070704011821-g7a8znh40gfvg2og
parent: aaron.bentley at utoronto.ca-20070704011547-alpnh0elj7k2xcdf
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 21:18:21 -0400
message:
Clarify doc
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2520.4.121
revision-id: aaron.bentley at utoronto.ca-20070704011547-alpnh0elj7k2xcdf
parent: aaron.bentley at utoronto.ca-20070703235745-gj0v09eqi9k8lrur
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 21:15:47 -0400
message:
Polish up submit command
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2520.4.120
revision-id: aaron.bentley at utoronto.ca-20070703235745-gj0v09eqi9k8lrur
parent: aaron.bentley at utoronto.ca-20070703060831-ynvii1iu87nvcogi
parent: abentley at panoramicfeedback.com-20070703224803-ycu1f6gw2534a2rx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 19:57:45 -0400
message:
Merge initial support for 'submit' command
renamed:
bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2520.4.117.1.5
revision-id: abentley at panoramicfeedback.com-20070703224803-ycu1f6gw2534a2rx
parent: abentley at panoramicfeedback.com-20070703224419-f0t5tyj6zhlubyfh
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 18:48:03 -0400
message:
Fix merge-from-branch
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2520.4.117.1.4
revision-id: abentley at panoramicfeedback.com-20070703224419-f0t5tyj6zhlubyfh
parent: abentley at panoramicfeedback.com-20070703205424-4y4w6dbzv04uulo1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 18:44:19 -0400
message:
Replace 'bundle-revisions' with 'submit' command
renamed:
bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2520.4.117.1.3
revision-id: abentley at panoramicfeedback.com-20070703205424-4y4w6dbzv04uulo1
parent: abentley at panoramicfeedback.com-20070703193017-r7g35am8j6omtxeu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 16:54:24 -0400
message:
fix sha1 in bundle format 4
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.117.1.2
revision-id: abentley at panoramicfeedback.com-20070703193017-r7g35am8j6omtxeu
parent: abentley at panoramicfeedback.com-20070629182057-c39r2mc22atnjlzs
parent: aaron.bentley at utoronto.ca-20070630045554-o9v9bdmr8o4m8ms2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 15:30:17 -0400
message:
Merge doc updates
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.117.1.1
revision-id: abentley at panoramicfeedback.com-20070629182057-c39r2mc22atnjlzs
parent: aaron.bentley at utoronto.ca-20070629010823-pmkbnl4yyakzd3ts
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-29 14:20:57 -0400
message:
Test installing revisions with subtrees
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.119
revision-id: aaron.bentley at utoronto.ca-20070703060831-ynvii1iu87nvcogi
parent: aaron.bentley at utoronto.ca-20070630045554-o9v9bdmr8o4m8ms2
parent: pqm at pqm.ubuntu.com-20070703052458-wh36exfav0xnj9nf
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-07-03 02:08:31 -0400
message:
Merged bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_add.py bench_add.py-20060516064526-6342399b2967266c
bzrlib/benchmarks/bench_bench.py bench_bench.py-20060609084943-2lv2wsi61vhkmj7b-1
bzrlib/benchmarks/bench_cache_utf8.py bench_encoding.py-20060810000746-nv69wfkxei7w2cij-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_inventory.py bench_inventory.py-20060611112709-gjo1kx0oudyo9qbv-1
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
bzrlib/benchmarks/bench_rocks.py bench_rocks.py-20060608120339-3ydxl3v2cori44zb-1
bzrlib/benchmarks/bench_sftp.py bench_sftp.py-20060810114659-67c1edb27503ebde
bzrlib/benchmarks/bench_startup.py bench_startup.py-20061006075337-q49on3zvfcbvarn3-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/benchmarks/bench_transform.py bench_transform.py-20060525041052-ysn0hlw94gcc57lm-1
bzrlib/benchmarks/bench_workingtree.py bench_workingtree.py-20060527061822-cxrgsa9ax2q4d82q-1
bzrlib/benchmarks/bench_xml.py bench_xml.py-20060816202544-ty0p415bb7om5gzd-1
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
------------------------------------------------------------
revno: 2520.4.118
revision-id: aaron.bentley at utoronto.ca-20070630045554-o9v9bdmr8o4m8ms2
parent: aaron.bentley at utoronto.ca-20070629010823-pmkbnl4yyakzd3ts
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sat 2007-06-30 00:55:54 -0400
message:
Add docs
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.117
revision-id: aaron.bentley at utoronto.ca-20070629010823-pmkbnl4yyakzd3ts
parent: aaron.bentley at utoronto.ca-20070629010536-k59ru9zdawg8aypy
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 21:08:23 -0400
message:
Update for new pack interface
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.116
revision-id: aaron.bentley at utoronto.ca-20070629010536-k59ru9zdawg8aypy
parent: aaron.bentley at utoronto.ca-20070629005052-hw2am9r8yv5jq9ys
parent: abentley at panoramicfeedback.com-20070628171306-scpsxn9g89cchzz8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 21:05:36 -0400
message:
Merge container format updates
modified:
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
------------------------------------------------------------
revno: 2520.4.115
revision-id: aaron.bentley at utoronto.ca-20070629005052-hw2am9r8yv5jq9ys
parent: abentley at panoramicfeedback.com-20070628204834-2gmckvnzhlpe067x
parent: pqm at pqm.ubuntu.com-20070628194410-pikmj08nsn9sci9h
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 20:50:52 -0400
message:
Merge bzr.dev
added:
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
------------------------------------------------------------
revno: 2520.4.114
revision-id: abentley at panoramicfeedback.com-20070628204834-2gmckvnzhlpe067x
parent: abentley at panoramicfeedback.com-20070628204130-96m1onr66tdxovgt
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 16:48:34 -0400
message:
Avoid deprecated method get_parent_names method
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.113
revision-id: abentley at panoramicfeedback.com-20070628204130-96m1onr66tdxovgt
parent: abentley at panoramicfeedback.com-20070628154506-v0f2y8979irc3dal
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 16:41:30 -0400
message:
Avoid peeking at Repository._serializer
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 2520.4.112
revision-id: abentley at panoramicfeedback.com-20070628154506-v0f2y8979irc3dal
parent: abentley at panoramicfeedback.com-20070628151201-0vaz9er4maknt1tv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 11:45:06 -0400
message:
Make cherry-pick merge directives possible
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.111
revision-id: abentley at panoramicfeedback.com-20070628151201-0vaz9er4maknt1tv
parent: abentley at panoramicfeedback.com-20070628144749-sifruimxo2qfwnbw
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 11:12:01 -0400
message:
Ensure that damaged preview patches produce a warning in merge
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
------------------------------------------------------------
revno: 2520.4.110
revision-id: abentley at panoramicfeedback.com-20070628144749-sifruimxo2qfwnbw
parent: abentley at panoramicfeedback.com-20070628141416-lf6u1noi6gk5lf1g
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 10:47:49 -0400
message:
Implement cherrypick support for merge directives
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
------------------------------------------------------------
revno: 2520.4.109
revision-id: abentley at panoramicfeedback.com-20070628141416-lf6u1noi6gk5lf1g
parent: aaron.bentley at utoronto.ca-20070628043159-nwi7dnmpvd6jn3ie
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 10:14:16 -0400
message:
start work on directive cherry-picking
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.108
revision-id: aaron.bentley at utoronto.ca-20070628043159-nwi7dnmpvd6jn3ie
parent: aaron.bentley at utoronto.ca-20070628022537-40re9wj8x04ehl61
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-28 00:31:59 -0400
message:
Start work on using merge base from directives
modified:
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.107
revision-id: aaron.bentley at utoronto.ca-20070628022537-40re9wj8x04ehl61
parent: abentley at panoramicfeedback.com-20070627161928-qbgntllck8r4jbs0
parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-27 22:25:37 -0400
message:
Merge bzr.dev
added:
bzrlib/api.py api.py-20070626082640-35lspz7j0ys7a8ld-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
doc/developers/dirstate.txt dirstate.txt-20070618020404-cdhv0ecgrukomemg-2
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
doc/developers/uncommit.txt uncommit.txt-20070621042721-4clw8ucb9u9yda2h-1
renamed:
doc/developers/performance-commit.txt => doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
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_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
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_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_api.py testapi.py-20051027033546-6f9be2d308d18a52
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_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
------------------------------------------------------------
revno: 2520.4.106
revision-id: abentley at panoramicfeedback.com-20070627161928-qbgntllck8r4jbs0
parent: abentley at panoramicfeedback.com-20070627161112-t1r8d32qifq7ox07
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-27 12:19:28 -0400
message:
Clarify what patch verification failure means
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 2520.4.105
revision-id: abentley at panoramicfeedback.com-20070627161112-t1r8d32qifq7ox07
parent: abentley at panoramicfeedback.com-20070627151232-5rks71udygelmu1l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-27 12:11:12 -0400
message:
Implement patch verification
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.104
revision-id: abentley at panoramicfeedback.com-20070627151232-5rks71udygelmu1l
parent: abentley at panoramicfeedback.com-20070626200554-vz12r3umida9qapy
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-27 11:12:32 -0400
message:
Avoid infinite loop when there is no unique lca
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 2520.4.103
revision-id: abentley at panoramicfeedback.com-20070626200554-vz12r3umida9qapy
parent: abentley at panoramicfeedback.com-20070626193318-7fhdw5h9dcucqhvl
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 16:05:54 -0400
message:
Add MultiParent.to_lines
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 2520.4.102
revision-id: abentley at panoramicfeedback.com-20070626193318-7fhdw5h9dcucqhvl
parent: abentley at panoramicfeedback.com-20070626193100-d6lhaut5mixlzw5r
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 15:33:18 -0400
message:
rename parents to metadata
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.101
revision-id: abentley at panoramicfeedback.com-20070626193100-d6lhaut5mixlzw5r
parent: abentley at panoramicfeedback.com-20070626185036-q2twi2igv3y94mic
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 15:31:00 -0400
message:
Use a registry to look up xml serializers by format
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
------------------------------------------------------------
revno: 2520.4.100
revision-id: abentley at panoramicfeedback.com-20070626185036-q2twi2igv3y94mic
parent: abentley at panoramicfeedback.com-20070626183935-jxfsq72rkej7ptoz
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 14:50:36 -0400
message:
Fix repeat signature installs
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.99
revision-id: abentley at panoramicfeedback.com-20070626183935-jxfsq72rkej7ptoz
parent: abentley at panoramicfeedback.com-20070626160921-xgpi52q1kqnn6dvt
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 14:39:35 -0400
message:
Test conversion across models
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.98
revision-id: abentley at panoramicfeedback.com-20070626160921-xgpi52q1kqnn6dvt
parent: abentley at panoramicfeedback.com-20070626153446-t6z9ctbc9f4z1bhm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 12:09:21 -0400
message:
Support inventory conversion with parents
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.97
revision-id: abentley at panoramicfeedback.com-20070626153446-t6z9ctbc9f4z1bhm
parent: abentley at panoramicfeedback.com-20070626142422-ghhb4i1e8d6naad9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 11:34:46 -0400
message:
Hack in support for inventory conversion
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
------------------------------------------------------------
revno: 2520.4.96
revision-id: abentley at panoramicfeedback.com-20070626142422-ghhb4i1e8d6naad9
parent: abentley at panoramicfeedback.com-20070626142025-wtuquq11gys566xz
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 10:24:22 -0400
message:
Remove unused base64 stuff
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.95
revision-id: abentley at panoramicfeedback.com-20070626142025-wtuquq11gys566xz
parent: abentley at panoramicfeedback.com-20070625210943-s62ybm0tg32sjirk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-26 10:20:25 -0400
message:
Add support for header/info records
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.94
revision-id: abentley at panoramicfeedback.com-20070625210943-s62ybm0tg32sjirk
parent: abentley at panoramicfeedback.com-20070625202538-j0k4t5akruv04e79
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-25 17:09:43 -0400
message:
Update bundle doc
modified:
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.93
revision-id: abentley at panoramicfeedback.com-20070625202538-j0k4t5akruv04e79
parent: abentley at panoramicfeedback.com-20070625201359-r54k3m8qrkzc58ib
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-25 16:25:38 -0400
message:
Fix lock handling in merge directives
modified:
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
------------------------------------------------------------
revno: 2520.4.92
revision-id: abentley at panoramicfeedback.com-20070625201359-r54k3m8qrkzc58ib
parent: abentley at panoramicfeedback.com-20070625190839-pbx61klsaa3csyfm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-25 16:13:59 -0400
message:
fix line-splitting in MultiParent.from_texts
modified:
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 2520.4.91
revision-id: abentley at panoramicfeedback.com-20070625190839-pbx61klsaa3csyfm
parent: aaron.bentley at utoronto.ca-20070623132058-9bgdk6m4jxre0c5w
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-25 15:08:39 -0400
message:
Okay, so I meant metaweave. I think.
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.90
revision-id: aaron.bentley at utoronto.ca-20070623132058-9bgdk6m4jxre0c5w
parent: aaron.bentley at utoronto.ca-20070623051425-xtdjn7z8xsaqah0f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sat 2007-06-23 09:20:58 -0400
message:
Handle \r terminated lines in Weaves properly
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.89
revision-id: aaron.bentley at utoronto.ca-20070623051425-xtdjn7z8xsaqah0f
parent: abentley at panoramicfeedback.com-20070622230523-ijd56o4ttto505yp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sat 2007-06-23 01:14:25 -0400
message:
Add get_sha1s to weaves
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
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: 2520.4.88
revision-id: abentley at panoramicfeedback.com-20070622230523-ijd56o4ttto505yp
parent: abentley at panoramicfeedback.com-20070622224228-35q5zzdqr90hgxrm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 19:05:23 -0400
message:
Retrieve all sha1s at once (ftw)
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 2520.4.87
revision-id: abentley at panoramicfeedback.com-20070622224228-35q5zzdqr90hgxrm
parent: abentley at panoramicfeedback.com-20070622221913-mcjioqruw8rhgnd8
parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 18:42:28 -0400
message:
Merge from bzr.dev
added:
bzrlib/tests/blackbox/test_lsprof.py test_lsprof.py-20070622025641-nbsm2svy8anvj9df-1
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 2520.4.86
revision-id: abentley at panoramicfeedback.com-20070622221913-mcjioqruw8rhgnd8
parent: abentley at panoramicfeedback.com-20070622215356-v2gdv5xzy8gzdsju
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 18:19:13 -0400
message:
Improve locking in _BaseMergeDirective.from_object
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
------------------------------------------------------------
revno: 2520.4.85
revision-id: abentley at panoramicfeedback.com-20070622215356-v2gdv5xzy8gzdsju
parent: abentley at panoramicfeedback.com-20070622213027-pj4680m5ht9my3ep
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 17:53:56 -0400
message:
Get all test passing (which just proves there aren't enough tests!)
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
------------------------------------------------------------
revno: 2520.4.84
revision-id: abentley at panoramicfeedback.com-20070622213027-pj4680m5ht9my3ep
parent: abentley at panoramicfeedback.com-20070622210221-1k64tr26h5wb00fn
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 17:30:27 -0400
message:
Fix heisenbug record-rewriting test
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.83
revision-id: abentley at panoramicfeedback.com-20070622210221-1k64tr26h5wb00fn
parent: abentley at panoramicfeedback.com-20070622202814-nw8j3845k012kdwo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 17:02:21 -0400
message:
Clean up tests
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.82
revision-id: abentley at panoramicfeedback.com-20070622202814-nw8j3845k012kdwo
parent: abentley at panoramicfeedback.com-20070622201901-4tmrag0r9le6t6a8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 16:28:14 -0400
message:
Fix tests to stop expecting bundles to build trees
modified:
bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
------------------------------------------------------------
revno: 2520.4.81
revision-id: abentley at panoramicfeedback.com-20070622201901-4tmrag0r9le6t6a8
parent: abentley at panoramicfeedback.com-20070622200015-r1t6ylsn0sft2s3f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 16:19:01 -0400
message:
Fix blackbox tests
modified:
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
------------------------------------------------------------
revno: 2520.4.80
revision-id: abentley at panoramicfeedback.com-20070622200015-r1t6ylsn0sft2s3f
parent: abentley at panoramicfeedback.com-20070622192615-5v34zjnm6lubmjp0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 16:00:15 -0400
message:
Improve merge directive tests
modified:
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.79
revision-id: abentley at panoramicfeedback.com-20070622192615-5v34zjnm6lubmjp0
parent: abentley at panoramicfeedback.com-20070622190140-rr1d906p3rhi98r2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 15:26:15 -0400
message:
Fixed up not-really-relevant munging tests
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.78
revision-id: abentley at panoramicfeedback.com-20070622190140-rr1d906p3rhi98r2
parent: abentley at panoramicfeedback.com-20070622184643-hh3f73087w00cg1l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 15:01:40 -0400
message:
Remove testament support from bundles
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.77
revision-id: abentley at panoramicfeedback.com-20070622184643-hh3f73087w00cg1l
parent: aaron.bentley at utoronto.ca-20070622055232-3f3b0jxdj76i6vjj
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 14:46:43 -0400
message:
Describe bundles and merge directives
modified:
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.76
revision-id: aaron.bentley at utoronto.ca-20070622055232-3f3b0jxdj76i6vjj
parent: aaron.bentley at utoronto.ca-20070622050411-sbv1lf3fw5237ssk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 01:52:32 -0400
message:
Move base64-encoding into merge directives
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.75
revision-id: aaron.bentley at utoronto.ca-20070622050411-sbv1lf3fw5237ssk
parent: aaron.bentley at utoronto.ca-20070622033706-m337tg8pvvawkcob
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-22 01:04:11 -0400
message:
Fix traceback on empty bundles.
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.74
revision-id: aaron.bentley at utoronto.ca-20070622033706-m337tg8pvvawkcob
parent: abentley at panoramicfeedback.com-20070621234317-5w3h8h36oe90sups
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 23:37:06 -0400
message:
bzr info handles patchless bundles
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
------------------------------------------------------------
revno: 2520.4.73
revision-id: abentley at panoramicfeedback.com-20070621234317-5w3h8h36oe90sups
parent: abentley at panoramicfeedback.com-20070621191028-9yy1ye6jneejm1ht
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 19:43:17 -0400
message:
Implement new merge directive format
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
------------------------------------------------------------
revno: 2520.4.72
revision-id: abentley at panoramicfeedback.com-20070621191028-9yy1ye6jneejm1ht
parent: abentley at panoramicfeedback.com-20070621184628-61j7hyz3jz1vgcv1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 15:10:28 -0400
message:
Rename format to 4alpha
renamed:
bzrlib/bundle/serializer/v10.py => bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.71
revision-id: abentley at panoramicfeedback.com-20070621184628-61j7hyz3jz1vgcv1
parent: abentley at panoramicfeedback.com-20070621181032-xrljru7ao3fqhvxk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 14:46:28 -0400
message:
Update test to accept VersionedFileInvalidChecksum instead of TestamentMismatch
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.70
revision-id: abentley at panoramicfeedback.com-20070621181032-xrljru7ao3fqhvxk
parent: abentley at panoramicfeedback.com-20070621175519-t3tqcojb0ygs00ke
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 14:10:32 -0400
message:
Yank patch-handling functionality
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.69
revision-id: abentley at panoramicfeedback.com-20070621175519-t3tqcojb0ygs00ke
parent: abentley at panoramicfeedback.com-20070621173615-5i1oph19t8fnqmsf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 13:55:19 -0400
message:
Simplify encoding by storing bodies in anonymous records
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.68
revision-id: abentley at panoramicfeedback.com-20070621173615-5i1oph19t8fnqmsf
parent: abentley at panoramicfeedback.com-20070621173418-tq9167bvowrklqg7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 13:36:15 -0400
message:
Change name separators to all-slash
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.67
revision-id: abentley at panoramicfeedback.com-20070621173418-tq9167bvowrklqg7
parent: abentley at panoramicfeedback.com-20070621154232-6rwrbujopqn3ydrf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 13:34:18 -0400
message:
Update docs slightly
modified:
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.66
revision-id: abentley at panoramicfeedback.com-20070621154232-6rwrbujopqn3ydrf
parent: aaron.bentley at utoronto.ca-20070621120651-0v95pcvjfuzqodbz
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 11:42:32 -0400
message:
Update bundle description
modified:
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.65
revision-id: aaron.bentley at utoronto.ca-20070621120651-0v95pcvjfuzqodbz
parent: aaron.bentley at utoronto.ca-20070621054638-hfmf2cposlhp2ddh
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 08:06:51 -0400
message:
bundle-format4.txt
added:
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
------------------------------------------------------------
revno: 2520.4.64
revision-id: aaron.bentley at utoronto.ca-20070621054638-hfmf2cposlhp2ddh
parent: aaron.bentley at utoronto.ca-20070621053527-rhs3b3u0ozpbr86v
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 01:46:38 -0400
message:
Avoid topo sort for v10 bundles
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.63
revision-id: aaron.bentley at utoronto.ca-20070621053527-rhs3b3u0ozpbr86v
parent: abentley at panoramicfeedback.com-20070620220622-9lasxr96rr0e0xvn
parent: pqm at pqm.ubuntu.com-20070621052237-2phm1z5dg4arrwnk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-21 01:35:27 -0400
message:
Merge bzr.dev
added:
doc/developers/planned-change-integration.txt plannedchangeintegra-20070619004702-i1b3ccamjtfaoq6w-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
------------------------------------------------------------
revno: 2520.4.62
revision-id: abentley at panoramicfeedback.com-20070620220622-9lasxr96rr0e0xvn
parent: abentley at panoramicfeedback.com-20070620172453-egg9dborzgsiir4v
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 18:06:22 -0400
message:
Use a fresh versionedfile each time
modified:
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.61
revision-id: abentley at panoramicfeedback.com-20070620172453-egg9dborzgsiir4v
parent: abentley at panoramicfeedback.com-20070620160813-2zt1l1cjypfo9ut6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 13:24:53 -0400
message:
Do bulk insertion of records
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.60
revision-id: abentley at panoramicfeedback.com-20070620160813-2zt1l1cjypfo9ut6
parent: abentley at panoramicfeedback.com-20070620154956-972lypn4ksoldass
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 12:08:13 -0400
message:
Add sha1 verification for mpdiffs
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.59
revision-id: abentley at panoramicfeedback.com-20070620154956-972lypn4ksoldass
parent: abentley at panoramicfeedback.com-20070620151957-dnstw073l1stty30
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 11:49:56 -0400
message:
Push metadata down the stack
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.58
revision-id: abentley at panoramicfeedback.com-20070620151957-dnstw073l1stty30
parent: abentley at panoramicfeedback.com-20070620140207-2pzquz4m0870jg49
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 11:19:57 -0400
message:
Propogate support for metadata to iter_revisions, add storage kind
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.57
revision-id: abentley at panoramicfeedback.com-20070620140207-2pzquz4m0870jg49
parent: aaron.bentley at utoronto.ca-20070620120021-cbroj10ks0grvz62
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 10:02:07 -0400
message:
Remove long-obsolete code
removed:
bzrlib/bundle/common.py common.py-20050619223838-f25048f6638f04c6
bzrlib/bundle/old/ old-20051119041827-8f2417a9cc3b67f2
bzrlib/bundle/old/send_changeset.py send_changeset.py-20050628200204-9478d383946f1871
------------------------------------------------------------
revno: 2520.4.56
revision-id: aaron.bentley at utoronto.ca-20070620120021-cbroj10ks0grvz62
parent: aaron.bentley at utoronto.ca-20070620050102-pftx49qxti3goosa
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 08:00:21 -0400
message:
Begin adding support for arbitrary metadata
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.55
revision-id: aaron.bentley at utoronto.ca-20070620050102-pftx49qxti3goosa
parent: aaron.bentley at utoronto.ca-20070620023938-dsrywb9k05tschj7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-20 01:01:02 -0400
message:
Fix file revision selection to grab all dependencies properly
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.54
revision-id: aaron.bentley at utoronto.ca-20070620023938-dsrywb9k05tschj7
parent: aaron.bentley at utoronto.ca-20070620002511-6mylajxf4mipn7g7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 22:39:38 -0400
message:
Hang a create_bundle method off repository
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 2520.4.53
revision-id: aaron.bentley at utoronto.ca-20070620002511-6mylajxf4mipn7g7
parent: aaron.bentley at utoronto.ca-20070619224859-a3alhu7s6n9huqq6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 20:25:11 -0400
message:
refactor bundle serialization to make write_bundle primary
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.52
revision-id: aaron.bentley at utoronto.ca-20070619224859-a3alhu7s6n9huqq6
parent: abentley at panoramicfeedback.com-20070619182030-pzrju21edb4n2y57
parent: pqm at pqm.ubuntu.com-20070619212256-y1148bn5gf4jg2dh
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 18:48:59 -0400
message:
Merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2520.4.51
revision-id: abentley at panoramicfeedback.com-20070619182030-pzrju21edb4n2y57
parent: abentley at panoramicfeedback.com-20070619180757-ybwzcla7683tl0p2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 14:20:30 -0400
message:
Split iteration through file revisions into a method, so we can vary it
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.50
revision-id: abentley at panoramicfeedback.com-20070619180757-ybwzcla7683tl0p2
parent: abentley at panoramicfeedback.com-20070619151416-lwcpo5pna7tqvale
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 14:07:57 -0400
message:
Split write functionality out into a separate object
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.49
revision-id: abentley at panoramicfeedback.com-20070619151416-lwcpo5pna7tqvale
parent: abentley at panoramicfeedback.com-20070619131705-tkigpvx0xhpefs9t
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 11:14:16 -0400
message:
Fix lock handling in bundle command
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
------------------------------------------------------------
revno: 2520.4.48
revision-id: abentley at panoramicfeedback.com-20070619131705-tkigpvx0xhpefs9t
parent: aaron.bentley at utoronto.ca-20070619125517-wzlu137pmbqvik3g
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 09:17:05 -0400
message:
Support getting blocks from knit deltas with no final EOL
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.47
revision-id: aaron.bentley at utoronto.ca-20070619125517-wzlu137pmbqvik3g
parent: abentley at panoramicfeedback.com-20070618222132-thva2ds64sss64ih
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-19 08:55:17 -0400
message:
Fix get_line_delta_blocks with eol
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 2520.4.46
revision-id: abentley at panoramicfeedback.com-20070618222132-thva2ds64sss64ih
parent: aaron.bentley at utoronto.ca-20070618022048-mk9jqqce7c8pez40
parent: pqm at pqm.ubuntu.com-20070618210710-6y8wzcqiw2kvxdiy
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-18 18:21:32 -0400
message:
Merge from bzr.dev
added:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
renamed:
bzrlib/graph.py => bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/tests/test_graph.py => bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
------------------------------------------------------------
revno: 2520.4.45
revision-id: aaron.bentley at utoronto.ca-20070618022048-mk9jqqce7c8pez40
parent: aaron.bentley at utoronto.ca-20070617201643-mzxwm5a21x6i74t4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sun 2007-06-17 22:20:48 -0400
message:
Handle inconsistencies in last-modified-revision between vf and inventory
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.44
revision-id: aaron.bentley at utoronto.ca-20070617201643-mzxwm5a21x6i74t4
parent: aaron.bentley at utoronto.ca-20070617201612-h8ol5ze6p8fa4hce
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sun 2007-06-17 16:16:43 -0400
message:
Fix encoding handling in bundle-info
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
------------------------------------------------------------
revno: 2520.4.43
revision-id: aaron.bentley at utoronto.ca-20070617201612-h8ol5ze6p8fa4hce
parent: aaron.bentley at utoronto.ca-20070617151129-l2hbncksoslro84y
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sun 2007-06-17 16:16:12 -0400
message:
Fix test suite
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.42
revision-id: aaron.bentley at utoronto.ca-20070617151129-l2hbncksoslro84y
parent: aaron.bentley at utoronto.ca-20070616132838-3epgsvjr4tealar8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sun 2007-06-17 11:11:29 -0400
message:
Don't assume every revision has a branch nick
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
------------------------------------------------------------
revno: 2520.4.41
revision-id: aaron.bentley at utoronto.ca-20070616132838-3epgsvjr4tealar8
parent: abentley at panoramicfeedback.com-20070615210534-j35nt792gbg9lyhu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sat 2007-06-16 09:28:38 -0400
message:
Accelerate mpdiff generation
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.40
revision-id: abentley at panoramicfeedback.com-20070615210534-j35nt792gbg9lyhu
parent: abentley at panoramicfeedback.com-20070615195417-1myh54o1ebmhyujg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 17:05:34 -0400
message:
Add human-readable diff to bundles
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.39
revision-id: abentley at panoramicfeedback.com-20070615195417-1myh54o1ebmhyujg
parent: abentley at panoramicfeedback.com-20070615185854-ztsenrglm6z0gcg7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 15:54:17 -0400
message:
Rename container => bundle(reader) where appropriate
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.38
revision-id: abentley at panoramicfeedback.com-20070615185854-ztsenrglm6z0gcg7
parent: abentley at panoramicfeedback.com-20070615185506-kftrlbthsitt7yd6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 14:58:54 -0400
message:
Update to latest API
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.37
revision-id: abentley at panoramicfeedback.com-20070615185506-kftrlbthsitt7yd6
parent: abentley at panoramicfeedback.com-20070615153257-bwlxiv2xm13taagh
parent: andrew.bennetts at canonical.com-20070614132802-bas89f67tqq4p3s6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 14:55:06 -0400
message:
Merge container changes
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
------------------------------------------------------------
revno: 2520.4.36
revision-id: abentley at panoramicfeedback.com-20070615153257-bwlxiv2xm13taagh
parent: abentley at panoramicfeedback.com-20070615141804-kqturh52i2e2aa1l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 11:32:57 -0400
message:
Speed up bundle reading, tweak help for bundle-info
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.35
revision-id: abentley at panoramicfeedback.com-20070615141804-kqturh52i2e2aa1l
parent: aaron.bentley at utoronto.ca-20070615112717-zchc59doyk2sfmqt
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 10:18:04 -0400
message:
zap obsolete changeset commands, add bundle-info command
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.34
revision-id: aaron.bentley at utoronto.ca-20070615112717-zchc59doyk2sfmqt
parent: aaron.bentley at utoronto.ca-20070615032719-4vgjf12ww670lwnu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Fri 2007-06-15 07:27:17 -0400
message:
Add signature support
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.33
revision-id: aaron.bentley at utoronto.ca-20070615032719-4vgjf12ww670lwnu
parent: aaron.bentley at utoronto.ca-20070615024753-mjfwbl93x6lrvtrq
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 23:27:19 -0400
message:
remove test dependencies on serialization minutia
modified:
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.32
revision-id: aaron.bentley at utoronto.ca-20070615024753-mjfwbl93x6lrvtrq
parent: aaron.bentley at utoronto.ca-20070615023406-p8knvrxt2qswcp6a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 22:47:53 -0400
message:
Fix test case
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.31
revision-id: aaron.bentley at utoronto.ca-20070615023406-p8knvrxt2qswcp6a
parent: aaron.bentley at utoronto.ca-20070615023115-cdu04pyub8dnnl7a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 22:34:06 -0400
message:
Using StringIO for splitting patch lines
modified:
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 2520.4.30
revision-id: aaron.bentley at utoronto.ca-20070615023115-cdu04pyub8dnnl7a
parent: abentley at panoramicfeedback.com-20070614232459-hpa3sbawd71o7u3d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 22:31:15 -0400
message:
Do our own line splitting for mp-diffs
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 2520.4.29
revision-id: abentley at panoramicfeedback.com-20070614232459-hpa3sbawd71o7u3d
parent: abentley at panoramicfeedback.com-20070614210648-hh2vb3t7agdof6i1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 19:24:59 -0400
message:
Reactivate some testing, fix topo_iter
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.28
revision-id: abentley at panoramicfeedback.com-20070614210648-hh2vb3t7agdof6i1
parent: abentley at panoramicfeedback.com-20070614201417-kqyis466gje6y242
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 17:06:48 -0400
message:
Force revisions to be topologically sorted
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 2520.4.27
revision-id: abentley at panoramicfeedback.com-20070614201417-kqyis466gje6y242
parent: abentley at panoramicfeedback.com-20070614190359-p259cpzx114svwbg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 16:14:17 -0400
message:
Use less memory when writing bzip-encoded files
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.26
revision-id: abentley at panoramicfeedback.com-20070614190359-p259cpzx114svwbg
parent: abentley at panoramicfeedback.com-20070614151450-0339tqg0dtvytomf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 15:03:59 -0400
message:
Make decompression reasonably memory-efficient
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.25
revision-id: abentley at panoramicfeedback.com-20070614151450-0339tqg0dtvytomf
parent: abentley at panoramicfeedback.com-20070614150544-kdefum9f4qod1muz
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 11:14:50 -0400
message:
Rename ContainerWriter/ContainerReader to BundleWriter/BundleReader
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.24
revision-id: abentley at panoramicfeedback.com-20070614150544-kdefum9f4qod1muz
parent: abentley at panoramicfeedback.com-20070614150408-aqxkmk4ql3qayla5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 11:05:44 -0400
message:
Move heading writing above container beginning
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.23
revision-id: abentley at panoramicfeedback.com-20070614150408-aqxkmk4ql3qayla5
parent: abentley at panoramicfeedback.com-20070614145051-a9a02aeg21t7p5yo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 11:04:08 -0400
message:
Move responsability for encoding into container objects
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.22
revision-id: abentley at panoramicfeedback.com-20070614145051-a9a02aeg21t7p5yo
parent: abentley at panoramicfeedback.com-20070614134034-62f8djek7v6io72w
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 10:50:51 -0400
message:
Create ContainerReader
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.21
revision-id: abentley at panoramicfeedback.com-20070614134034-62f8djek7v6io72w
parent: aaron.bentley at utoronto.ca-20070614124412-1wryyqy1uxhn2j0g
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 09:40:34 -0400
message:
Finish turning ContainerWriter into a new layer
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.20
revision-id: aaron.bentley at utoronto.ca-20070614124412-1wryyqy1uxhn2j0g
parent: abentley at panoramicfeedback.com-20070613141901-h24lvby5f0klif1d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Thu 2007-06-14 08:44:12 -0400
message:
Compress and base64-encode bundle contents
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.19
revision-id: abentley at panoramicfeedback.com-20070613141901-h24lvby5f0klif1d
parent: abentley at panoramicfeedback.com-20070613135555-bd7v11neg1yj41tg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-13 10:19:01 -0400
message:
Rename format to 1.0alpha
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.18
revision-id: abentley at panoramicfeedback.com-20070613135555-bd7v11neg1yj41tg
parent: aaron.bentley at utoronto.ca-20070613063655-s2mdwt0ybdmnlo0w
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-13 09:55:55 -0400
message:
Generate mpdiffs for inventory
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.17
revision-id: aaron.bentley at utoronto.ca-20070613063655-s2mdwt0ybdmnlo0w
parent: aaron.bentley at utoronto.ca-20070613043730-lll1fxxy3mfne2dl
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-13 02:36:55 -0400
message:
Merge bzr.dev
added:
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
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/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 2520.4.16
revision-id: aaron.bentley at utoronto.ca-20070613043730-lll1fxxy3mfne2dl
parent: aaron.bentley at utoronto.ca-20070613035407-6tijerg0tti5wocg
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Wed 2007-06-13 00:37:30 -0400
message:
Handle empty versions correctly
modified:
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 2520.4.15
revision-id: aaron.bentley at utoronto.ca-20070613035407-6tijerg0tti5wocg
parent: aaron.bentley at utoronto.ca-20070613035223-wwbwduh6mcueo7o0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-12 23:54:07 -0400
message:
Fix _get_bundle invocations
modified:
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
------------------------------------------------------------
revno: 2520.4.14
revision-id: aaron.bentley at utoronto.ca-20070613035223-wwbwduh6mcueo7o0
parent: aaron.bentley at utoronto.ca-20070612021514-ut2t1haosv5o5103
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Tue 2007-06-12 23:52:23 -0400
message:
Get most tests passing, use format header
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.13
revision-id: aaron.bentley at utoronto.ca-20070612021514-ut2t1haosv5o5103
parent: aaron.bentley at utoronto.ca-20070612021411-pa2ju7b1loqkq6gm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 22:15:14 -0400
message:
Use real container implementation
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.12
revision-id: aaron.bentley at utoronto.ca-20070612021411-pa2ju7b1loqkq6gm
parent: abentley at panoramicfeedback.com-20070611231420-lp2csdswjqmjp0kq
parent: andrew.bennetts at canonical.com-20070609034820-t7u540w5pyhvtgn3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 22:14:11 -0400
message:
Merge real container implementation
added:
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
------------------------------------------------------------
revno: 2520.4.11
revision-id: abentley at panoramicfeedback.com-20070611231420-lp2csdswjqmjp0kq
parent: abentley at panoramicfeedback.com-20070611230326-dtd5enylxnr1m05z
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 19:14:20 -0400
message:
Default to V10
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
------------------------------------------------------------
revno: 2520.4.10
revision-id: abentley at panoramicfeedback.com-20070611230326-dtd5enylxnr1m05z
parent: abentley at panoramicfeedback.com-20070611220925-xjhfisk17770cwud
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 19:03:26 -0400
message:
Enable installation of revisions
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.9
revision-id: abentley at panoramicfeedback.com-20070611220925-xjhfisk17770cwud
parent: abentley at panoramicfeedback.com-20070611165531-7t13giwn5srpnemf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 18:09:25 -0400
message:
Test inventory_vf parents
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.8
revision-id: abentley at panoramicfeedback.com-20070611165531-7t13giwn5srpnemf
parent: abentley at panoramicfeedback.com-20070611151011-mlcggb0oguqssdhu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 12:55:31 -0400
message:
Serialize inventory
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.7
revision-id: abentley at panoramicfeedback.com-20070611151011-mlcggb0oguqssdhu
parent: abentley at panoramicfeedback.com-20070611145952-cwt4480gphdhen6l
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 11:10:11 -0400
message:
Fix patch deserialization
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 2520.4.6
revision-id: abentley at panoramicfeedback.com-20070611145952-cwt4480gphdhen6l
parent: aaron.bentley at utoronto.ca-20070611121043-c79wtxxt15v8iy1c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 10:59:52 -0400
message:
Get installation started
modified:
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.5
revision-id: aaron.bentley at utoronto.ca-20070611121043-c79wtxxt15v8iy1c
parent: aaron.bentley at utoronto.ca-20070611062822-72j7ky4jszv1p45t
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 08:10:43 -0400
message:
Start work on reading mpbundles
modified:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.4
revision-id: aaron.bentley at utoronto.ca-20070611062822-72j7ky4jszv1p45t
parent: aaron.bentley at utoronto.ca-20070611051153-rn2cxa7sn8xxh2j5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 02:28:22 -0400
message:
Get basis support for a new bundle format in place
added:
bzrlib/bundle/serializer/v10.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
modified:
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2520.4.3
revision-id: aaron.bentley at utoronto.ca-20070611051153-rn2cxa7sn8xxh2j5
parent: aaron.bentley at utoronto.ca-20070611023508-5pr3felqiyaq18iy
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Mon 2007-06-11 01:11:53 -0400
message:
Implement plain strategy for extracting and installing multiparent diffs
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 2520.4.2
revision-id: aaron.bentley at utoronto.ca-20070611023508-5pr3felqiyaq18iy
parent: aaron.bentley at utoronto.ca-20070611021058-7mqy4fsayv27zper
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sun 2007-06-10 22:35:08 -0400
message:
Integrate mpdiff into bazaar
removed:
mpdiff mpdiff-20070410170043-8yfvd9yb6bq457db-1
mpknit mpknit-20070410173815-0xgbcuu4x3a41tgp-1
renamed:
__init__.py => bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py => bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
test_multiparent.py => bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 2520.4.1
revision-id: aaron.bentley at utoronto.ca-20070611021058-7mqy4fsayv27zper
parent: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
parent: aaron.bentley at utoronto.ca-20070517163555-3i7jamitmffdg85l
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.mpbundle
timestamp: Sun 2007-06-10 22:10:58 -0400
message:
Merge from multiparent
added:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
mpdiff mpdiff-20070410170043-8yfvd9yb6bq457db-1
mpknit mpknit-20070410173815-0xgbcuu4x3a41tgp-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.37
revision-id: aaron.bentley at utoronto.ca-20070517163555-3i7jamitmffdg85l
parent: aaron.bentley at utoronto.ca-20070414072354-8g2awkl9xgkdkx3h
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-05-17 17:35:55 +0100
message:
Add docstring
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 0.7.36
revision-id: aaron.bentley at utoronto.ca-20070414072354-8g2awkl9xgkdkx3h
parent: abentley at panoramicfeedback.com-20070414055201-hmz83pf1w4whsi79
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Sat 2007-04-14 03:23:54 -0400
message:
merge changes
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.35
revision-id: abentley at panoramicfeedback.com-20070414055201-hmz83pf1w4whsi79
parent: abentley at panoramicfeedback.com-20070413203416-7jeoifz1gq41ashn
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Sat 2007-04-14 01:52:01 -0400
message:
Add build ranking
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.34
revision-id: abentley at panoramicfeedback.com-20070413203416-7jeoifz1gq41ashn
parent: abentley at panoramicfeedback.com-20070413172354-hejzo2abnnfkga8b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Fri 2007-04-13 16:34:16 -0400
message:
Implement save, load, snapshot-by-size
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.33
revision-id: abentley at panoramicfeedback.com-20070413172354-hejzo2abnnfkga8b
parent: abentley at panoramicfeedback.com-20070413161641-uch3j6ur8lc5l989
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Fri 2007-04-13 13:23:54 -0400
message:
Enable caching commandline param
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.32
revision-id: abentley at panoramicfeedback.com-20070413161641-uch3j6ur8lc5l989
parent: abentley at panoramicfeedback.com-20070413160903-dretiv0cjsv72hnk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Fri 2007-04-13 12:16:41 -0400
message:
Allow specifying --outfile and --memory
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 0.7.31
revision-id: abentley at panoramicfeedback.com-20070413160903-dretiv0cjsv72hnk
parent: abentley at panoramicfeedback.com-20070413155626-8hpzareuti247zmu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Fri 2007-04-13 12:09:03 -0400
message:
Allow selecting MemoryVersionedFile from commandline
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.30
revision-id: abentley at panoramicfeedback.com-20070413155626-8hpzareuti247zmu
parent: aaron.bentley at utoronto.ca-20070413114405-ldopk3ihc7g2gz22
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Fri 2007-04-13 11:56:26 -0400
message:
Split into MultiVersionedFile and MultiMemoryVersionedFile
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.29
revision-id: aaron.bentley at utoronto.ca-20070413114405-ldopk3ihc7g2gz22
parent: aaron.bentley at utoronto.ca-20070413032610-0kl5e35fb1h41wax
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Fri 2007-04-13 07:44:05 -0400
message:
Support using disk for knit reconstruction
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.28
revision-id: aaron.bentley at utoronto.ca-20070413032610-0kl5e35fb1h41wax
parent: aaron.bentley at utoronto.ca-20070413024204-2dx1m0kegx252jsx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-04-12 23:26:10 -0400
message:
Update snapshot-picking to use sets of ancestors
modified:
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.27
revision-id: aaron.bentley at utoronto.ca-20070413024204-2dx1m0kegx252jsx
parent: aaron.bentley at utoronto.ca-20070413015040-9p1zv3nxm036g3mi
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-04-12 22:42:04 -0400
message:
Fix version writing
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 0.7.26
revision-id: aaron.bentley at utoronto.ca-20070413015040-9p1zv3nxm036g3mi
parent: abentley at panoramicfeedback.com-20070412205657-s2zabk4ukaexp9bu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-04-12 21:50:40 -0400
message:
Move topological iteration into an iterator
modified:
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.25
revision-id: abentley at panoramicfeedback.com-20070412205657-s2zabk4ukaexp9bu
parent: aaron.bentley at utoronto.ca-20070412122029-bnprn1pweeegnph3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Thu 2007-04-12 16:56:57 -0400
message:
More messy hacking
removed:
multiparent/ multiparent-20070410165554-oish6zivsm56jz0n-1
renamed:
multiparent/__init__.py => multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.24
revision-id: aaron.bentley at utoronto.ca-20070412122029-bnprn1pweeegnph3
parent: aaron.bentley at utoronto.ca-20070412052122-fcqoswo0oearlj8a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-04-12 08:20:29 -0400
message:
Add some snapshot-selection crack
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.23
revision-id: aaron.bentley at utoronto.ca-20070412052122-fcqoswo0oearlj8a
parent: aaron.bentley at utoronto.ca-20070412043921-nl2n5ez9pl4m8vxj
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-04-12 01:21:22 -0400
message:
handle snapshots all at once
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.22
revision-id: aaron.bentley at utoronto.ca-20070412043921-nl2n5ez9pl4m8vxj
parent: aaron.bentley at utoronto.ca-20070412023811-x7enxbfo9hy71t4t
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Thu 2007-04-12 00:39:21 -0400
message:
Fix restoration bug
modified:
__init__.py mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.21
revision-id: aaron.bentley at utoronto.ca-20070412023811-x7enxbfo9hy71t4t
parent: aaron.bentley at utoronto.ca-20070412012353-nd4p9jnnchr3gxjo
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Wed 2007-04-11 22:38:11 -0400
message:
finish converting ft_ to snapshots
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.20
revision-id: aaron.bentley at utoronto.ca-20070412012353-nd4p9jnnchr3gxjo
parent: abentley at panoramicfeedback.com-20070411220315-k35yco5t4prdi6n0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: multiparent
timestamp: Wed 2007-04-11 21:23:53 -0400
message:
Convert to a plugin
removed:
.bzrignore bzrignore-20070410234508-prpi2q917yj7ns24-1
multiparent/tests/ tests-20070410133617-n1jdhcc1n1mibarp-3
renamed:
mpregen => __init__.py* mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent/tests/test_multiparent.py => test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
__init__.py* mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 0.7.19
revision-id: abentley at panoramicfeedback.com-20070411220315-k35yco5t4prdi6n0
parent: abentley at panoramicfeedback.com-20070411203957-j7uadxym4214p6ly
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Wed 2007-04-11 18:03:15 -0400
message:
More tweakage
modified:
mpregen mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.18
revision-id: abentley at panoramicfeedback.com-20070411203957-j7uadxym4214p6ly
parent: abentley at panoramicfeedback.com-20070411200340-81f58wipd7jpeoe7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Wed 2007-04-11 16:39:57 -0400
message:
Implement from_patch
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
multiparent/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.17
revision-id: abentley at panoramicfeedback.com-20070411200340-81f58wipd7jpeoe7
parent: abentley at panoramicfeedback.com-20070411175052-uvfmwfyaqg7muqf2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Wed 2007-04-11 16:03:40 -0400
message:
Dynamically select snapshots based on all parents
modified:
mpregen mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.16
revision-id: abentley at panoramicfeedback.com-20070411175052-uvfmwfyaqg7muqf2
parent: abentley at panoramicfeedback.com-20070411141030-iu8981q6qgm91wg6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Wed 2007-04-11 13:50:52 -0400
message:
More control over snapshotting, disable caching for inventory
modified:
mpregen mpregen-20070411063203-5x9z7i73add0d6f6-1
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.15
revision-id: abentley at panoramicfeedback.com-20070411141030-iu8981q6qgm91wg6
parent: abentley at panoramicfeedback.com-20070411140941-4ch4vyw3gerb7dmm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Wed 2007-04-11 10:10:30 -0400
message:
Make mpregen output a psuedo-knit
modified:
mpregen mpregen-20070411063203-5x9z7i73add0d6f6-1
------------------------------------------------------------
revno: 0.7.14
revision-id: abentley at panoramicfeedback.com-20070411140941-4ch4vyw3gerb7dmm
parent: abentley at panoramicfeedback.com-20070411125025-swu1vxorxv15l7vs
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Wed 2007-04-11 10:09:41 -0400
message:
Temporarily force snapshots to 44
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.13
revision-id: abentley at panoramicfeedback.com-20070411125025-swu1vxorxv15l7vs
parent: aaron.bentley at utoronto.ca-20070411063909-t630ktlwrss64yyk
parent: abentley at panoramicfeedback.com-20070410185805-n4swrf30u7ivajgg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: temp
timestamp: Wed 2007-04-11 08:50:25 -0400
message:
Merge
modified:
mpknit mpknit-20070410173815-0xgbcuu4x3a41tgp-1
------------------------------------------------------------
revno: 0.7.6.1.1
revision-id: abentley at panoramicfeedback.com-20070410185805-n4swrf30u7ivajgg
parent: abentley at panoramicfeedback.com-20070410173827-hvguwu1iaxxk3olo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 14:58:05 -0400
message:
Tree locking's always a good idea
modified:
mpknit mpknit-20070410173815-0xgbcuu4x3a41tgp-1
------------------------------------------------------------
revno: 0.7.12
revision-id: aaron.bentley at utoronto.ca-20070411063909-t630ktlwrss64yyk
parent: aaron.bentley at utoronto.ca-20070411041839-33qitnr1gkc0essj
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mpknit
timestamp: Wed 2007-04-11 02:39:09 -0400
message:
Make benchmarks for mp
added:
mpregen mpregen-20070411063203-5x9z7i73add0d6f6-1
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.11
revision-id: aaron.bentley at utoronto.ca-20070411041839-33qitnr1gkc0essj
parent: aaron.bentley at utoronto.ca-20070411034552-r3o32h9akqd7wrll
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mpknit
timestamp: Wed 2007-04-11 00:18:39 -0400
message:
Implement reconstruct_version, handle all hunks through that
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
multiparent/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.10
revision-id: aaron.bentley at utoronto.ca-20070411034552-r3o32h9akqd7wrll
parent: aaron.bentley at utoronto.ca-20070411030235-q8ngiatm1np64piq
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mpknit
timestamp: Tue 2007-04-10 23:45:52 -0400
message:
Text reconstruction seems to work
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
multiparent/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.9
revision-id: aaron.bentley at utoronto.ca-20070411030235-q8ngiatm1np64piq
parent: aaron.bentley at utoronto.ca-20070411001609-fbx52la1yi0o3ui9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mpknit
timestamp: Tue 2007-04-10 23:02:35 -0400
message:
Much progress on non-naive text reconstruction
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
multiparent/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.8
revision-id: aaron.bentley at utoronto.ca-20070411001609-fbx52la1yi0o3ui9
parent: aaron.bentley at utoronto.ca-20070410234515-reyhqm22o5lcj2i0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mpknit
timestamp: Tue 2007-04-10 20:16:09 -0400
message:
get add_version working
renamed:
tests => multiparent/tests tests-20070410133617-n1jdhcc1n1mibarp-3
modified:
multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
multiparent/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.7
revision-id: aaron.bentley at utoronto.ca-20070410234515-reyhqm22o5lcj2i0
parent: abentley at panoramicfeedback.com-20070410173827-hvguwu1iaxxk3olo
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mpknit
timestamp: Tue 2007-04-10 19:45:15 -0400
message:
Support dirstate in mpknit
added:
.bzrignore bzrignore-20070410234508-prpi2q917yj7ns24-1
modified:
mpknit mpknit-20070410173815-0xgbcuu4x3a41tgp-1
------------------------------------------------------------
revno: 0.7.6
revision-id: abentley at panoramicfeedback.com-20070410173827-hvguwu1iaxxk3olo
parent: abentley at panoramicfeedback.com-20070410170759-d6x4p4f8991rhzbl
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 13:38:27 -0400
message:
Add mpknit command
added:
mpknit mpknit-20070410173815-0xgbcuu4x3a41tgp-1
------------------------------------------------------------
revno: 0.7.5
revision-id: abentley at panoramicfeedback.com-20070410170759-d6x4p4f8991rhzbl
parent: abentley at panoramicfeedback.com-20070410165451-2iurz267ur027vjr
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 13:07:59 -0400
message:
Add mpdiff command for diffing multiple files to the commandline
added:
mpdiff mpdiff-20070410170043-8yfvd9yb6bq457db-1
multiparent/ multiparent-20070410165554-oish6zivsm56jz0n-1
renamed:
__init__.py => multiparent/__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
------------------------------------------------------------
revno: 0.7.4
revision-id: abentley at panoramicfeedback.com-20070410165451-2iurz267ur027vjr
parent: abentley at panoramicfeedback.com-20070410163232-y2w6ke39sxb305yv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 12:54:51 -0400
message:
Start supporting serialization
modified:
__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.3
revision-id: abentley at panoramicfeedback.com-20070410163232-y2w6ke39sxb305yv
parent: abentley at panoramicfeedback.com-20070410162405-sczvbxmrwek7l2g5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 12:32:32 -0400
message:
Get three-parent comparisions under test
modified:
__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.2
revision-id: abentley at panoramicfeedback.com-20070410162405-sczvbxmrwek7l2g5
parent: abentley at panoramicfeedback.com-20070410141425-86yh4m1cb6wwnwwm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 12:24:05 -0400
message:
Get single-parent comparison working
modified:
__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 0.7.1
revision-id: abentley at panoramicfeedback.com-20070410141425-86yh4m1cb6wwnwwm
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: multiparent
timestamp: Tue 2007-04-10 10:14:25 -0400
message:
Get trivial case passing
added:
__init__.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
tests/ tests-20070410133617-n1jdhcc1n1mibarp-3
tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
------------------------------------------------------------
revno: 2625.1.5
revision-id: pqm at pqm.ubuntu.com-20070719081031-069ugi2mfg8accj1
parent: pqm at pqm.ubuntu.com-20070719071637-0rm8kj6vaswb9zty
parent: ian.clatworthy at internode.on.net-20070719073723-24e82ct97qno1ub5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 09:10:31 +0100
message:
(Ian Clatworthy) Tweak the 'make plugins public' change following feedback from lifeless
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2625.1.4.1.1
revision-id: ian.clatworthy at internode.on.net-20070719073723-24e82ct97qno1ub5
parent: pqm at pqm.ubuntu.com-20070719071637-0rm8kj6vaswb9zty
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Thu 2007-07-19 17:37:23 +1000
message:
(Ian Clatworthy) Tweak the 'make plugins public' change following feedback from lifeless
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2625.1.4
revision-id: pqm at pqm.ubuntu.com-20070719071637-0rm8kj6vaswb9zty
parent: pqm at pqm.ubuntu.com-20070719062212-492i9t2j91oiwjxy
parent: ian.clatworthy at internode.on.net-20070719064237-h19qnfyrfmwubvez
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 08:16:37 +0100
message:
(Ian Clatworthy) make plugins command public with better help
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2625.1.3.1.1
revision-id: ian.clatworthy at internode.on.net-20070719064237-h19qnfyrfmwubvez
parent: pqm at pqm.ubuntu.com-20070719062212-492i9t2j91oiwjxy
parent: ian.clatworthy at internode.on.net-20070713084553-7is76iha0tj6o4lo
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Thu 2007-07-19 16:42:37 +1000
message:
(Ian Clatworthy) make plugins command public with better help
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2617.3.1
revision-id: ian.clatworthy at internode.on.net-20070713084553-7is76iha0tj6o4lo
parent: pqm at pqm.ubuntu.com-20070713074627-93zxs9uh528y0fki
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.plugins-public
timestamp: Fri 2007-07-13 18:45:53 +1000
message:
Make the plugins command public with better help
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2625.1.3
revision-id: pqm at pqm.ubuntu.com-20070719062212-492i9t2j91oiwjxy
parent: pqm at pqm.ubuntu.com-20070719011840-ewngzmxi6tct4vs3
parent: ian.clatworthy at internode.on.net-20070719034054-5yccb10yeari6b7u
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 07:22:12 +0100
message:
Merge Kent's work for left alignment of log output for merge only revisions
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 2625.1.2.1.1
revision-id: ian.clatworthy at internode.on.net-20070719034054-5yccb10yeari6b7u
parent: pqm at pqm.ubuntu.com-20070719011840-ewngzmxi6tct4vs3
parent: kent at ispirenetworks.com-20070707032028-abmivg21e6bdva3c
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Thu 2007-07-19 13:40:54 +1000
message:
Merge Kent's work for left alignment of log output for merge only revisions
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 2466.8.1.3.3
revision-id: kent at ispirenetworks.com-20070707032028-abmivg21e6bdva3c
parent: warthog618 at gmail.com-20070507095504-h218h9pfkcftmaqt
committer: Kent Gibson <kent at ispirenetworks.com>
branch nick: log_range
timestamp: Sat 2007-07-07 11:20:28 +0800
message:
Fix JAM's review comments for left align patch
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 2466.8.1.3.2
revision-id: warthog618 at gmail.com-20070507095504-h218h9pfkcftmaqt
parent: warthog618 at gmail.com-20070504104926-dmz6x2gw7ydb8i7p
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: log_range
timestamp: Mon 2007-05-07 17:55:04 +0800
message:
shift log output with only merge revisions to the left margin
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 2625.1.2
revision-id: pqm at pqm.ubuntu.com-20070719011840-ewngzmxi6tct4vs3
parent: pqm at pqm.ubuntu.com-20070719002624-zgt7cyq39hwp4p36
parent: robertc at robertcollins.net-20070719001750-6h1finyqxcc2rv8y
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 02:18:40 +0100
message:
(robert collins) Reduce the number of all-history lookups done by push and pull.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2625.3.1
revision-id: robertc at robertcollins.net-20070719001750-6h1finyqxcc2rv8y
parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2007-07-19 10:17:50 +1000
message:
* ``bzr pull`` and ``bzr push`` no longer do a complete walk of the
branch revision history for ui display unless -v is supplied.
(Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2625.1.1
revision-id: pqm at pqm.ubuntu.com-20070719002624-zgt7cyq39hwp4p36
parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
parent: john at arbash-meinel.com-20070718231946-w2cdi5h14cn5chfr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 01:26:24 +0100
message:
(Jelmer Vernooij) Fix bug #125955: Sanitize SSH_AUTH_SOCK environment variable
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2625.2.1
revision-id: john at arbash-meinel.com-20070718231946-w2cdi5h14cn5chfr
parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
parent: jelmer at samba.org-20070714194244-l880hn3dtlrb8jum
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-07-18 18:19:46 -0500
message:
(Jelmer Vernooij) Fix bug #125955: Sanitize SSH_AUTH_SOCK environment variable
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2617.2.1
revision-id: jelmer at samba.org-20070714194244-l880hn3dtlrb8jum
parent: pqm at pqm.ubuntu.com-20070713074627-93zxs9uh528y0fki
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: selftest-sanitize
timestamp: Sat 2007-07-14 22:42:44 +0300
message:
Sanitize SSH_AUTH_SOCK environment variable (#125955).
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
Diff too large for email (15392 lines, the limit is 1000).
More information about the bazaar-commits
mailing list