Rev 3642: merge bzr.dev at 3650 in http://bazaar.launchpad.net/%7Ebzr/bzr/osx_tests_fix
Vincent Ladeuil
v.ladeuil+lp at free.fr
Tue Aug 26 17:45:04 BST 2008
At http://bazaar.launchpad.net/%7Ebzr/bzr/osx_tests_fix
------------------------------------------------------------
revno: 3642
revision-id: v.ladeuil+lp at free.fr-20080826164412-glyk2qaoyzb8zql5
parent: v.ladeuil+lp at free.fr-20080826131330-xgh1m6v9i2636jw0
parent: pqm at pqm.ubuntu.com-20080826151717-xb3qgwv6xta124k7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Tue 2008-08-26 18:44:12 +0200
message:
merge bzr.dev at 3650
removed:
tools/win32/survey.txt survey.txt-20070809075950-sf265mgu9oog8jjb-1
added:
bzrlib/_btree_serializer_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/_btree_serializer_py.py _parse_btree_py.py-20080703034413-3q25bklkenti3p8p-3
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
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/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3638.2.12
revision-id: pqm at pqm.ubuntu.com-20080826151717-xb3qgwv6xta124k7
parent: pqm at pqm.ubuntu.com-20080825182248-dydy5bn4n5akbfjq
parent: v.ladeuil+lp at free.fr-20080826144327-uzsnxxnyzibacxqd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-08-26 16:17:17 +0100
message:
(vila) HFS on OSX is case-insensitive too, fix some failing tests
modified:
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3638.13.1
revision-id: v.ladeuil+lp at free.fr-20080826144327-uzsnxxnyzibacxqd
parent: pqm at pqm.ubuntu.com-20080825182248-dydy5bn4n5akbfjq
parent: v.ladeuil+lp at free.fr-20080826143353-y4s0frtmvgrsph6g
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Tue 2008-08-26 16:43:27 +0200
message:
(vila) HFS on OSX is case-insensitive too, fix some failing tests
modified:
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3638.12.1
revision-id: v.ladeuil+lp at free.fr-20080826143353-y4s0frtmvgrsph6g
parent: pqm at pqm.ubuntu.com-20080825182248-dydy5bn4n5akbfjq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: wt-ci
timestamp: Tue 2008-08-26 16:33:53 +0200
message:
OSX too needs to accept 'bzr mv foo Foo' when foo and Foo are the same file.
No new tests (existing ones were failing on OSX), this fixes the code.
* bzrlib/workingtree.py:
(WorkingTree._determine_mv_mode): Case sensitivity is what matter
here, it exists outside of win32 (i.e. OSX).
modified:
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3638.2.11
revision-id: pqm at pqm.ubuntu.com-20080825182248-dydy5bn4n5akbfjq
parent: pqm at pqm.ubuntu.com-20080825155147-ftf2dt3m9bim9col
parent: john at arbash-meinel.com-20080825174941-8jaycasth6hrgxbi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-08-25 19:22:48 +0100
message:
(jam) Merge 1.6.0-final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3638.11.1
revision-id: john at arbash-meinel.com-20080825174941-8jaycasth6hrgxbi
parent: pqm at pqm.ubuntu.com-20080825155147-ftf2dt3m9bim9col
parent: pqm at pqm.ubuntu.com-20080825143827-fl7cocq59pqdig2p
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2008-08-25 12:49:41 -0500
message:
Merge 1.6.0-final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3606.5.9
revision-id: pqm at pqm.ubuntu.com-20080825143827-fl7cocq59pqdig2p
parent: pqm at pqm.ubuntu.com-20080819231728-vrtdr5jyvvzquhcj
parent: john at arbash-meinel.com-20080825140614-spjktabmbncx9bk8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Mon 2008-08-25 15:38:27 +0100
message:
(jam) 1.6.0-final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.9.1
revision-id: john at arbash-meinel.com-20080825140614-spjktabmbncx9bk8
parent: pqm at pqm.ubuntu.com-20080819231728-vrtdr5jyvvzquhcj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2008-08-25 09:06:14 -0500
message:
1.6-final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3638.2.10
revision-id: pqm at pqm.ubuntu.com-20080825155147-ftf2dt3m9bim9col
parent: pqm at pqm.ubuntu.com-20080823185447-4fimhc5kjnedx6t6
parent: argentina at gmail.com-20080821212915-6uh45pqncy9sj76y
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-08-25 16:51:47 +0100
message:
(Martin Albisetti) Updates to the PPA docs to help release managers
find their way.
modified:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3638.10.4
revision-id: argentina at gmail.com-20080821212915-6uh45pqncy9sj76y
parent: martin.albisett at canonical.com-20080820173833-whj50smgvpz38b7k
committer: Martin Albisetti <argentina at gmail.com>
branch nick: tweak_ppa
timestamp: Thu 2008-08-21 18:29:15 -0300
message:
Meh
modified:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3638.10.3
revision-id: martin.albisett at canonical.com-20080820173833-whj50smgvpz38b7k
parent: martin.albisett at canonical.com-20080820173433-523pwmaqxk95sjno
committer: Martin Albisetti <martin.albisett at canonical.com>
branch nick: tweak_ppa
timestamp: Wed 2008-08-20 14:38:33 -0300
message:
Small whitespace fix
modified:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3638.10.2
revision-id: martin.albisett at canonical.com-20080820173433-523pwmaqxk95sjno
parent: martin.albisett at canonical.com-20080820161139-hhsu6y8rvn5y3h3s
committer: Martin Albisetti <martin.albisett at canonical.com>
branch nick: tweak_ppa
timestamp: Wed 2008-08-20 14:34:33 -0300
message:
More fixes to address jam's comments. Made all bzr versions in the examples the same.
modified:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3638.10.1
revision-id: martin.albisett at canonical.com-20080820161139-hhsu6y8rvn5y3h3s
parent: pqm at pqm.ubuntu.com-20080819152536-6oobtmrum8e34h8l
committer: Martin Albisetti <martin.albisett at canonical.com>
branch nick: tweak_ppa
timestamp: Wed 2008-08-20 13:11:39 -0300
message:
Tweaks to the PPA docs to remove recommendation to use Launchpad's copy feature, and other small changes
modified:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3638.2.9
revision-id: pqm at pqm.ubuntu.com-20080823185447-4fimhc5kjnedx6t6
parent: pqm at pqm.ubuntu.com-20080823182447-e5emry5ut2d0c3ex
parent: jelmer at samba.org-20080823175741-96tg1bbfyzp91b8s
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-08-23 19:54:47 +0100
message:
(James Westby) Give the user a bit more information about which saved
location is being used.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
------------------------------------------------------------
revno: 3638.9.1
revision-id: jelmer at samba.org-20080823175741-96tg1bbfyzp91b8s
parent: pqm at pqm.ubuntu.com-20080823174134-lx67nymraun1onby
parent: jw+debian at jameswestby.net-20080802171050-yay05j3l6yoygbxc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Sat 2008-08-23 19:57:41 +0200
message:
Merge James patch with default location notification improvements.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
------------------------------------------------------------
revno: 3596.3.1
revision-id: jw+debian at jameswestby.net-20080802171050-yay05j3l6yoygbxc
parent: pqm at pqm.ubuntu.com-20080730213059-hcremsawwvcqjcj1
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.urls
timestamp: Sat 2008-08-02 18:10:50 +0100
message:
Give the user a bit more information about which saved location is being used.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
------------------------------------------------------------
revno: 3638.2.8
revision-id: pqm at pqm.ubuntu.com-20080823182447-e5emry5ut2d0c3ex
parent: pqm at pqm.ubuntu.com-20080823174134-lx67nymraun1onby
parent: jelmer at samba.org-20080823175334-mipkzuwc62qbhd9u
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-08-23 19:24:47 +0100
message:
(Neil Martinsen-Burrell) Mail clients listed in a registry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
------------------------------------------------------------
revno: 3638.7.2
revision-id: jelmer at samba.org-20080823175334-mipkzuwc62qbhd9u
parent: jelmer at samba.org-20080823152030-zz5d4mcu1rlp1q51
parent: nmb at wartburg.edu-20080819194906-ozq57i7uozwnwpos
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Sat 2008-08-23 19:53:34 +0200
message:
Merge Neil's email client registry patch.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
------------------------------------------------------------
revno: 3638.8.5
revision-id: nmb at wartburg.edu-20080819194906-ozq57i7uozwnwpos
parent: nmb at wartburg.edu-20080819193359-7ae05y62mfu6x52a
committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
branch nick: email-client-registry
timestamp: Tue 2008-08-19 14:49:06 -0500
message:
use docstrings as help messages for registered mail clients
modified:
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
------------------------------------------------------------
revno: 3638.8.4
revision-id: nmb at wartburg.edu-20080819193359-7ae05y62mfu6x52a
parent: nmb at wartburg.edu-20080819160950-3toy7mhz2ticb6dc
committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
branch nick: email-client-registry
timestamp: Tue 2008-08-19 14:33:59 -0500
message:
Address JAMs review. Dont use register_lazy and dont lazy_import anything other than modules
modified:
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
------------------------------------------------------------
revno: 3638.8.3
revision-id: nmb at wartburg.edu-20080819160950-3toy7mhz2ticb6dc
parent: nmb at wartburg.edu-20080819151434-om1o3k0np4dem3uw
committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
branch nick: email-client-registry
timestamp: Tue 2008-08-19 11:09:50 -0500
message:
Mention mail_client_registry in NEWS and help
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3638.8.2
revision-id: nmb at wartburg.edu-20080819151434-om1o3k0np4dem3uw
parent: nmb at wartburg.edu-20080819031255-bs3kjjz8aresvu92
committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
branch nick: email-client-registry
timestamp: Tue 2008-08-19 10:14:34 -0500
message:
put registry information with each class
modified:
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
------------------------------------------------------------
revno: 3638.8.1
revision-id: nmb at wartburg.edu-20080819031255-bs3kjjz8aresvu92
parent: pqm at pqm.ubuntu.com-20080816000954-t0401ff8s3ydnkr6
committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
branch nick: email-client-registry
timestamp: Mon 2008-08-18 22:12:55 -0500
message:
Use a registry for mail clients.
modified:
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
------------------------------------------------------------
revno: 3638.2.7
revision-id: pqm at pqm.ubuntu.com-20080823174134-lx67nymraun1onby
parent: pqm at pqm.ubuntu.com-20080822042630-on3dxyek4ezk0miu
parent: jelmer at samba.org-20080823152030-zz5d4mcu1rlp1q51
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-08-23 18:41:34 +0100
message:
(Jelmer) Remove deprecated Branch.abspath and unimplemented
Branch.rename_one and Branch.move.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 3638.7.1
revision-id: jelmer at samba.org-20080823152030-zz5d4mcu1rlp1q51
parent: pqm at pqm.ubuntu.com-20080822042630-on3dxyek4ezk0miu
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Sat 2008-08-23 17:20:30 +0200
message:
Remove deprecated Branch.abspath and unimplemented Branch.rename_one and Branch.move.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 3638.2.6
revision-id: pqm at pqm.ubuntu.com-20080822042630-on3dxyek4ezk0miu
parent: pqm at pqm.ubuntu.com-20080821190656-7uoj39e0c3q3b893
parent: john at arbash-meinel.com-20080822035429-qa604ysmpghwzcs3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-08-22 05:26:30 +0100
message:
(robertc, jam) Bring in the good bits for btree_index (index2 plugin)
added:
bzrlib/_btree_serializer_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/_btree_serializer_py.py _parse_btree_py.py-20080703034413-3q25bklkenti3p8p-3
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3638.6.32
revision-id: john at arbash-meinel.com-20080822035429-qa604ysmpghwzcs3
parent: john at arbash-meinel.com-20080822022908-420tr0519tdz6pxy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree_submitted
timestamp: Thu 2008-08-21 22:54:29 -0500
message:
PQM's pyrex version requires Py_ssize_t to be manually defined
modified:
bzrlib/_btree_serializer_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
------------------------------------------------------------
revno: 3638.6.31
revision-id: john at arbash-meinel.com-20080822022908-420tr0519tdz6pxy
parent: john at arbash-meinel.com-20080822021827-682x4linhe28stky
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 21:29:08 -0500
message:
NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3638.6.30
revision-id: john at arbash-meinel.com-20080822021827-682x4linhe28stky
parent: john at arbash-meinel.com-20080822020936-gtpffetj2a7xkw0x
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 21:18:27 -0500
message:
Rename _parse_btree to _btree_serializer
renamed:
bzrlib/_parse_btree_c.pyx => bzrlib/_btree_serializer_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/_parse_btree_py.py => bzrlib/_btree_serializer_py.py _parse_btree_py.py-20080703034413-3q25bklkenti3p8p-3
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3638.6.29
revision-id: john at arbash-meinel.com-20080822020936-gtpffetj2a7xkw0x
parent: john at arbash-meinel.com-20080822020328-4q21ldih7c3ne64g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 21:09:36 -0500
message:
Cleanup the copyright headers
modified:
bzrlib/_parse_btree_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/_parse_btree_py.py _parse_btree_py.py-20080703034413-3q25bklkenti3p8p-3
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
------------------------------------------------------------
revno: 3638.6.28
revision-id: john at arbash-meinel.com-20080822020328-4q21ldih7c3ne64g
parent: john at arbash-meinel.com-20080821225821-sio6j57zwk7kvqe2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 21:03:28 -0500
message:
Remove FixedMemoryGraphIndex
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
------------------------------------------------------------
revno: 3638.6.27
revision-id: john at arbash-meinel.com-20080821225821-sio6j57zwk7kvqe2
parent: john at arbash-meinel.com-20080821223604-rc82s2mo1sxcb78p
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 17:58:21 -0500
message:
Bringing reserved in as a keyword to write() also saves some time.
ChunkWriter.write() is called for every key, so having an extra redirection
The
was a measurable loss. Also, a small tuneup for the compressor that
we access often. Unfortunately, there isn't much more tuning
that we can do in that function.
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
------------------------------------------------------------
revno: 3638.6.26
revision-id: john at arbash-meinel.com-20080821223604-rc82s2mo1sxcb78p
parent: john at arbash-meinel.com-20080821222839-xy2yufgx6m6zzzt2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 17:36:04 -0500
message:
A couple small tweaks.
modified:
bzrlib/_parse_btree_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
------------------------------------------------------------
revno: 3638.6.25
revision-id: john at arbash-meinel.com-20080821222839-xy2yufgx6m6zzzt2
parent: john at arbash-meinel.com-20080821215857-xfk04aivsp0ntvpd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 17:28:39 -0500
message:
Shave off some more time by using exact accessors.
Basically, the inner access is using PyTuple and PyString functions
instead of their PyObject counterparts.
modified:
bzrlib/_parse_btree_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
------------------------------------------------------------
revno: 3638.6.24
revision-id: john at arbash-meinel.com-20080821215857-xfk04aivsp0ntvpd
parent: john at arbash-meinel.com-20080821213749-uoi9fiyg0aiea9sn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 16:58:57 -0500
message:
Use the compiled flatten function.
Shows a 3-5% gain in testing and real-world conditions.
modified:
bzrlib/_parse_btree_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
------------------------------------------------------------
revno: 3638.6.23
revision-id: john at arbash-meinel.com-20080821213749-uoi9fiyg0aiea9sn
parent: john at arbash-meinel.com-20080821213603-wkxu0as290eh2q1a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 16:37:49 -0500
message:
Flattened all the way down the stack.
Next might be to try using something other than plain iteration.
Like using PySequenceFast or some variant thereof.
modified:
bzrlib/_parse_btree_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
------------------------------------------------------------
revno: 3638.6.22
revision-id: john at arbash-meinel.com-20080821213603-wkxu0as290eh2q1a
parent: john at arbash-meinel.com-20080821213350-z3mh2p34aiiz7nno
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 16:36:03 -0500
message:
flatten the next level
modified:
bzrlib/_parse_btree_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
------------------------------------------------------------
revno: 3638.6.21
revision-id: john at arbash-meinel.com-20080821213350-z3mh2p34aiiz7nno
parent: john at arbash-meinel.com-20080821212617-gng6c2akl8985wcm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 16:33:50 -0500
message:
Flatten the outermost str.join() into memcpy's
modified:
bzrlib/_parse_btree_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
------------------------------------------------------------
revno: 3638.6.20
revision-id: john at arbash-meinel.com-20080821212617-gng6c2akl8985wcm
parent: john at arbash-meinel.com-20080821205458-cjk22p6p5yqfhmv7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 16:26:17 -0500
message:
We have a single malloc for the final output.
We just need to collapse the intermediates.
modified:
bzrlib/_parse_btree_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
------------------------------------------------------------
revno: 3638.6.19
revision-id: john at arbash-meinel.com-20080821205458-cjk22p6p5yqfhmv7
parent: john at arbash-meinel.com-20080821202206-nvbybzwmfvagg4jm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 15:54:58 -0500
message:
The flatten code now handles the no-ref-list case.
modified:
bzrlib/_parse_btree_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3638.6.18
revision-id: john at arbash-meinel.com-20080821202206-nvbybzwmfvagg4jm
parent: john at arbash-meinel.com-20080821195703-ze7jwvq1r2rbgmr3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 15:22:06 -0500
message:
Start working on a compiled function for transforming
a node => serialized key and line.
modified:
bzrlib/_parse_btree_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/_parse_btree_py.py _parse_btree_py.py-20080703034413-3q25bklkenti3p8p-3
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3638.6.17
revision-id: john at arbash-meinel.com-20080821195703-ze7jwvq1r2rbgmr3
parent: john at arbash-meinel.com-20080821195353-1q7mrhcjqerr5rhh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 14:57:03 -0500
message:
sum(map(len, foo))) is better than using += for one-off.
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3638.6.16
revision-id: john at arbash-meinel.com-20080821195353-1q7mrhcjqerr5rhh
parent: john at arbash-meinel.com-20080821193558-0a4qni76jso98gxn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 14:53:53 -0500
message:
Somewhat surprisingly, tracking bytes_out_len makes a
large difference in performance. It drops the three_level test time
from 9.2s => 8.2s. My best guess is that when adding with Z_SYNC_FLUSH
we get a *lot* of small strings, and we loop over it each time
we add another string.
Real world tests show improvement, too.
For mysql, repack=2,nocopy time 59.3=>57.4
For bzr.dev, repack=2,nocopy time 9.6=>9.3
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3638.6.15
revision-id: john at arbash-meinel.com-20080821193558-0a4qni76jso98gxn
parent: john at arbash-meinel.com-20080821192346-4mtm95v5g4kkxbyu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 14:35:58 -0500
message:
Now that we have real data, remove the copy() code.
It didn't really benefit us over just doing another repack.
There was a small benefit when the compressor is genuinely full,
but that path is rarely encountered because we stop repacking by effort
rather than by space. It also stablizes the tests for all
platforms, because the copy() code would alter the packing
slightly.
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3638.6.14
revision-id: john at arbash-meinel.com-20080821192346-4mtm95v5g4kkxbyu
parent: john at arbash-meinel.com-20080820231159-lp0gxglwyxveiot7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 14:23:46 -0500
message:
Replace time/space benchmarks with real-world testing.
Basically, the value was overstated, because the artifical nodes
were significantly more compressible than real data.
With these results, using .copy() basically is the same time/space
trade off as allowing another repack.
1-repack + copy() is mostly equivalent to 2-repack with no copy
(in both time and space).
They generally seem to be an appropriate 'sweet spot'.
The extra pack (copy) avoids pathological behavior of not filling in
the last bytes while only adding a small overhead.
(approx 10% time cost at 20% space savings.)
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3638.6.13
revision-id: john at arbash-meinel.com-20080820231159-lp0gxglwyxveiot7
parent: john at arbash-meinel.com-20080820224419-j0mtnzs2myy1n1y1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-20 18:11:59 -0500
message:
Some more data points for the time/repack tradeoff.
Instead of always using copy() we can use a multi-step process.
1) Always add bytes ignoring flush until _default_min_compression
2) Add bytes using Z_SYNC_FLUSH until we hit the page limit,
and then repack N times.
3) After repacking N times, switch to using copy() before adding
a new node with Z_SYNC_FLUSH.
4) If we re-use the copy() compressor we will get max packing
or we can just use the SYNC compressor until it is full,
and then return the copy.
Current stats are done using the artificial data. We should
produce a set using real-world data so we can pick the best
time/space tradeoff. Further, we can use this information to
find the best space values if someone issues a 'bzr pack'
command. Since that is generally a 'spend more time to get
better results' command.
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3638.6.12
revision-id: john at arbash-meinel.com-20080820224419-j0mtnzs2myy1n1y1
parent: john at arbash-meinel.com-20080820221200-1pnk090rjwbydavn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-20 17:44:19 -0500
message:
Collect some info on the space/time tradeoff for _max_repack.
With the test data, we pretty much always hit max_repack before we
get everything fully packed.
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3638.6.11
revision-id: john at arbash-meinel.com-20080820221200-1pnk090rjwbydavn
parent: john at arbash-meinel.com-20080820205738-0tb90jyr27jhv51x
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-20 17:12:00 -0500
message:
Start working on an alternate way to track compressed_chunk state.
I tried doing a copy() before flush() but that is quite expensive.
Both because it now does copy() but it also does a bigger flush.
Next I'll try tracking 2 objects.
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3638.6.10
revision-id: john at arbash-meinel.com-20080820205738-0tb90jyr27jhv51x
parent: john at arbash-meinel.com-20080820205049-7l4thdx06q971jnm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-20 15:57:38 -0500
message:
Flatten a double inner loop into a double list comprehension.
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
------------------------------------------------------------
revno: 3638.6.9
revision-id: john at arbash-meinel.com-20080820205049-7l4thdx06q971jnm
parent: john at arbash-meinel.com-20080820204134-irezo791nj00wq91
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-20 15:50:49 -0500
message:
Special case around _iter_smallest when we have only
1 iterator. Shaves another 0.5s off of the test time.
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
------------------------------------------------------------
revno: 3638.6.8
revision-id: john at arbash-meinel.com-20080820204134-irezo791nj00wq91
parent: john at arbash-meinel.com-20080820203247-12vpd1nvqhvwaexo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-20 15:41:34 -0500
message:
Move the add_key helper function into a separate func
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
------------------------------------------------------------
revno: 3638.6.7
revision-id: john at arbash-meinel.com-20080820203247-12vpd1nvqhvwaexo
parent: john at arbash-meinel.com-20080820202100-hu678q27vjhcgrrl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-20 15:32:47 -0500
message:
Make it easier to profile the btree writer time
modified:
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3638.6.6
revision-id: john at arbash-meinel.com-20080820202100-hu678q27vjhcgrrl
parent: john at arbash-meinel.com-20080820193429-0v5jm5zd4gggejpx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-20 15:21:00 -0500
message:
Dropping the number of nodes to 100k from 200k
It is still enough to create a 3-level index, but all tests
run 2x faster.
We currently spend 1.635s creating and 3.733s adding nodes
and 9.842s flushing in the three_level and iter_all tests.
The test is 15s down from 68s which is a lot better.
It would be nice to have sub second tests, though.
For now, we'll live with this.
modified:
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3638.6.5
revision-id: john at arbash-meinel.com-20080820193429-0v5jm5zd4gggejpx
parent: john at arbash-meinel.com-20080820185434-t1y91biejviv7skx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-20 14:34:29 -0500
message:
For iter_all and three_level tests adjust spill-at.
It turns out that when adding 200k entries, we spill to disk 2 times.
Which adds 20s to the test for each spill to disk.
So instead of 20s for 1 flush, we get 60s (for three_level).
This does increase memory consumption, but it drops the test
time from 64s => 35s.
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3638.6.4
revision-id: john at arbash-meinel.com-20080820185434-t1y91biejviv7skx
parent: john at arbash-meinel.com-20080820183041-w4v2pat3fniihxv4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-20 13:54:34 -0500
message:
Tweak some 'sum' lines.
change sum(len(b) for b in foo) to sum(map(len, foo))
This is a drastic improvement under lsprof, though it
turns out to be a minor to non-improvement in actual
time.
Under lsprof 272s => 123s (50%)
without lsprof 68s => 64s (minor)
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3638.6.3
revision-id: john at arbash-meinel.com-20080820183041-w4v2pat3fniihxv4
parent: john at arbash-meinel.com-20080820164905-mqtajmbxbxlr078g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-20 13:30:41 -0500
message:
Change the header to indicate these indexes are
not the same as the index2 plugin.
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3638.6.2
revision-id: john at arbash-meinel.com-20080820164905-mqtajmbxbxlr078g
parent: john at arbash-meinel.com-20080819231201-hc361se0f7okf08y
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-20 11:49:05 -0500
message:
Clean up some variable names, add some documentation.
modified:
bzrlib/_parse_btree_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
------------------------------------------------------------
revno: 3638.6.1
revision-id: john at arbash-meinel.com-20080819231201-hc361se0f7okf08y
parent: pqm at pqm.ubuntu.com-20080819152536-6oobtmrum8e34h8l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Tue 2008-08-19 18:12:01 -0500
message:
Bring in the btree_index and chunk_writer code and their tests.
added:
bzrlib/_parse_btree_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/_parse_btree_py.py _parse_btree_py.py-20080703034413-3q25bklkenti3p8p-3
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3638.2.5
revision-id: pqm at pqm.ubuntu.com-20080821190656-7uoj39e0c3q3b893
parent: pqm at pqm.ubuntu.com-20080820164550-e4vt9gdxv8hlic7n
parent: john at arbash-meinel.com-20080821162035-1zr12m9rx6llkrrq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-21 20:06:56 +0100
message:
(jam) Fix bug #259855,
if Transport.stat() returns 0 for permission bits, ignore it
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
------------------------------------------------------------
revno: 3638.5.2
revision-id: john at arbash-meinel.com-20080821162035-1zr12m9rx6llkrrq
parent: john at arbash-meinel.com-20080821161257-39lgj4it2n7kw30g
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ftp_mode_259855
timestamp: Thu 2008-08-21 11:20:35 -0500
message:
NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3638.5.1
revision-id: john at arbash-meinel.com-20080821161257-39lgj4it2n7kw30g
parent: pqm at pqm.ubuntu.com-20080819152536-6oobtmrum8e34h8l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: ftp_mode_259855
timestamp: Thu 2008-08-21 11:12:57 -0500
message:
Fix bug #259855, if a Transport returns 0 for permission bits, ignore it
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
------------------------------------------------------------
revno: 3638.2.4
revision-id: pqm at pqm.ubuntu.com-20080820164550-e4vt9gdxv8hlic7n
parent: pqm at pqm.ubuntu.com-20080819152536-6oobtmrum8e34h8l
parent: john at arbash-meinel.com-20080820161409-pl5tzssd7wlxi7ma
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-08-20 17:45:50 +0100
message:
(jam) Merge in 1.6rc5 and revert disabling default stack on policy
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3638.4.1
revision-id: john at arbash-meinel.com-20080820161409-pl5tzssd7wlxi7ma
parent: pqm at pqm.ubuntu.com-20080819152536-6oobtmrum8e34h8l
parent: pqm at pqm.ubuntu.com-20080819231728-vrtdr5jyvvzquhcj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2008-08-20 11:14:09 -0500
message:
Merge in 1.6rc5 and revert disabling default stack on policy
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3606.5.8
revision-id: pqm at pqm.ubuntu.com-20080819231728-vrtdr5jyvvzquhcj
parent: pqm at pqm.ubuntu.com-20080819221503-jvqhmuigxbdpelbd
parent: john at arbash-meinel.com-20080819224532-n720ccihpygyaz39
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Wed 2008-08-20 00:17:28 +0100
message:
(jam) Fix the release date for 1.6rc5
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3606.8.4
revision-id: john at arbash-meinel.com-20080819224532-n720ccihpygyaz39
parent: john at arbash-meinel.com-20080819214515-7wsqo3bdfui2lejq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stacking_policy
timestamp: Tue 2008-08-19 17:45:32 -0500
message:
Fix the release date for 1.6rc5
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3606.5.7
revision-id: pqm at pqm.ubuntu.com-20080819221503-jvqhmuigxbdpelbd
parent: pqm at pqm.ubuntu.com-20080818234533-ixoxs0ca9kygqe0m
parent: john at arbash-meinel.com-20080819214515-7wsqo3bdfui2lejq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Tue 2008-08-19 23:15:03 +0100
message:
(jam) Disable detecting stack-on policy from a containing BzrDir
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3606.8.3
revision-id: john at arbash-meinel.com-20080819214515-7wsqo3bdfui2lejq
parent: john at arbash-meinel.com-20080819213740-x0z2gh94t15ofcko
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stacking_policy
timestamp: Tue 2008-08-19 16:45:15 -0500
message:
push doesn't notify because it doesn't notice by default.
modified:
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
------------------------------------------------------------
revno: 3606.8.2
revision-id: john at arbash-meinel.com-20080819213740-x0z2gh94t15ofcko
parent: john at arbash-meinel.com-20080819210422-rqtvebr36783vpqy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stacking_policy
timestamp: Tue 2008-08-19 16:37:40 -0500
message:
Prepare 1.6rc5
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.8.1
revision-id: john at arbash-meinel.com-20080819210422-rqtvebr36783vpqy
parent: pqm at pqm.ubuntu.com-20080818234533-ixoxs0ca9kygqe0m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stacking_policy
timestamp: Tue 2008-08-19 16:04:22 -0500
message:
Disable auto-detecting the default stacking url
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3638.2.3
revision-id: pqm at pqm.ubuntu.com-20080819152536-6oobtmrum8e34h8l
parent: pqm at pqm.ubuntu.com-20080819034437-8cr7y59abr4wemaz
parent: john at arbash-meinel.com-20080819145408-ibct0khuxzte1tt4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-08-19 16:25:36 +0100
message:
(jam) Merge in bzr-1.6rc4 including the fix for bug #256757
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 3638.3.1
revision-id: john at arbash-meinel.com-20080819145408-ibct0khuxzte1tt4
parent: pqm at pqm.ubuntu.com-20080819034437-8cr7y59abr4wemaz
parent: pqm at pqm.ubuntu.com-20080818234533-ixoxs0ca9kygqe0m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2008-08-19 09:54:08 -0500
message:
Merge in bzr-1.6rc4 including the fix for bug #256757
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 3606.5.6
revision-id: pqm at pqm.ubuntu.com-20080818234533-ixoxs0ca9kygqe0m
parent: pqm at pqm.ubuntu.com-20080814165207-0sfq9u9vy6rl7oxc
parent: john at arbash-meinel.com-20080818231159-r9buncgsgj6cja4j
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Tue 2008-08-19 00:45:33 +0100
message:
(jam) Fix bug #256757, when fetching knits => packs,
use the existing deltas
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 3606.7.8
revision-id: john at arbash-meinel.com-20080818231159-r9buncgsgj6cja4j
parent: john at arbash-meinel.com-20080818223421-todjny24vj4faj4t
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_regression_256757
timestamp: Mon 2008-08-18 18:11:59 -0500
message:
Switch names to 'unordered' that I missed before.
modified:
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 3606.7.7
revision-id: john at arbash-meinel.com-20080818223421-todjny24vj4faj4t
parent: john at arbash-meinel.com-20080818192544-nohhonfyuaf2ut88
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_regression_256757
timestamp: Mon 2008-08-18 17:34:21 -0500
message:
Add tests for the fetching behavior.
The proper parameter passed is 'unordered' add an assert for it, and
fix callers that were passing 'unsorted' instead.
Add tests that we make the right get_record_stream call based
on the value of _fetch_uses_deltas.
Fix the fetch request for signatures.
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
------------------------------------------------------------
revno: 3606.7.6
revision-id: john at arbash-meinel.com-20080818192544-nohhonfyuaf2ut88
parent: john at arbash-meinel.com-20080818192501-4r4h4x21yrd36jrd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_regression_256757
timestamp: Mon 2008-08-18 14:25:44 -0500
message:
Prepare 1.6rc4
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.7.5
revision-id: john at arbash-meinel.com-20080818192501-4r4h4x21yrd36jrd
parent: john at arbash-meinel.com-20080818191542-52i3flqrkeufhjw2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_regression_256757
timestamp: Mon 2008-08-18 14:25:01 -0500
message:
Fixup NEWS to be more accurate.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3606.7.4
revision-id: john at arbash-meinel.com-20080818191542-52i3flqrkeufhjw2
parent: john at arbash-meinel.com-20080818191351-de63gybx2jaco2yo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_regression_256757
timestamp: Mon 2008-08-18 14:15:42 -0500
message:
We don't have to change the default order either.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3606.7.3
revision-id: john at arbash-meinel.com-20080818191351-de63gybx2jaco2yo
parent: john at arbash-meinel.com-20080818190432-gkn0umj08xln8owu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_regression_256757
timestamp: Mon 2008-08-18 14:13:51 -0500
message:
We don't have to fetch in topological order, as long as we fix all of the delta logic pieces.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 3606.7.2
revision-id: john at arbash-meinel.com-20080818190432-gkn0umj08xln8owu
parent: john at arbash-meinel.com-20080818185537-w3abkc3a29c7828t
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_regression_256757
timestamp: Mon 2008-08-18 14:04:32 -0500
message:
Find a couple more places with incorrect logic, and fix the tests effected.
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 3606.7.1
revision-id: john at arbash-meinel.com-20080818185537-w3abkc3a29c7828t
parent: pqm at pqm.ubuntu.com-20080814165207-0sfq9u9vy6rl7oxc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_regression_256757
timestamp: Mon 2008-08-18 13:55:37 -0500
message:
Fix bug #256757 by restoring knit => pack fetches to use topological ordering and preserve deltas.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3638.2.2
revision-id: pqm at pqm.ubuntu.com-20080819034437-8cr7y59abr4wemaz
parent: pqm at pqm.ubuntu.com-20080818180008-9488xkn2acyv2obu
parent: robertc at robertcollins.net-20080819030837-gt22111eeu4dw6m3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-08-19 04:44:37 +0100
message:
(robertc) Fix performance regression in status PATH. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
------------------------------------------------------------
revno: 3636.1.2
revision-id: robertc at robertcollins.net-20080819030837-gt22111eeu4dw6m3
parent: robertc at robertcollins.net-20080816222801-pnbv5wkg3rrsjko0
parent: pqm at pqm.ubuntu.com-20080818180008-9488xkn2acyv2obu
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2008-08-19 13:08:37 +1000
message:
Resolve NEWS.
removed:
tools/win32/survey.txt survey.txt-20070809075950-sf265mgu9oog8jjb-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3636.1.1
revision-id: robertc at robertcollins.net-20080816222801-pnbv5wkg3rrsjko0
parent: pqm at pqm.ubuntu.com-20080815025810-eguaiqf0kwwqo4yp
committer: Robert Collins <robertc at robertcollins.net>
branch nick: status
timestamp: Sun 2008-08-17 08:28:01 +1000
message:
Stop passing specific_file lists to show_tree_status when the specific
file list refers to an entire tree - that is wasteful and has significant
performance impact. (Robert Collins, #225204)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
------------------------------------------------------------
revno: 3638.2.1
revision-id: pqm at pqm.ubuntu.com-20080818180008-9488xkn2acyv2obu
parent: pqm at pqm.ubuntu.com-20080816000954-t0401ff8s3ydnkr6
parent: bialix at ukr.net-20080818092936-aoyxitu1nj5zc4m8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-08-18 19:00:08 +0100
message:
(bialix) remove out-of-date options from Windows standalone installer.
removed:
tools/win32/survey.txt survey.txt-20070809075950-sf265mgu9oog8jjb-1
modified:
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3638.1.1
revision-id: bialix at ukr.net-20080818092936-aoyxitu1nj5zc4m8
parent: pqm at pqm.ubuntu.com-20080816000954-t0401ff8s3ydnkr6
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32installer
timestamp: Mon 2008-08-18 12:29:36 +0300
message:
remove out-of-date options from Windows standalone installer.
removed:
tools/win32/survey.txt survey.txt-20070809075950-sf265mgu9oog8jjb-1
modified:
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
-------------- next part --------------
Diff too large for email (4052 lines, the limit is 1000).
More information about the bazaar-commits
mailing list