Rev 3694: Merge in bzr.dev 3698 in http://bzr.arbash-meinel.com/branches/bzr/1.8-dev/sftp_chunked
John Arbash Meinel
john at arbash-meinel.com
Wed Sep 10 18:33:12 BST 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.8-dev/sftp_chunked
------------------------------------------------------------
revno: 3694
revision-id: john at arbash-meinel.com-20080910173301-niz0pw3mcat430o1
parent: john at arbash-meinel.com-20080910172134-os9otcyg1rdbgi0s
parent: pqm at pqm.ubuntu.com-20080910053334-fy7gihd6da2nyhy2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: sftp_chunked
timestamp: Wed 2008-09-10 12:33:01 -0500
message:
Merge in bzr.dev 3698
added:
doc/developers/overview.txt overview.txt-20080904022501-ww2ggomrs5elxfm0-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzr.ico bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3686.1.12
revision-id: pqm at pqm.ubuntu.com-20080910053334-fy7gihd6da2nyhy2
parent: pqm at pqm.ubuntu.com-20080909173348-5y4vo2tga9d19fpa
parent: john at arbash-meinel.com-20080910045457-abzebw04q75dtprs
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-09-10 06:33:34 +0100
message:
(jam) Merge in bzr-1.7rc1, open bzr-1.8 for development.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3686.12.1
revision-id: john at arbash-meinel.com-20080910045457-abzebw04q75dtprs
parent: pqm at pqm.ubuntu.com-20080909173348-5y4vo2tga9d19fpa
parent: pqm at pqm.ubuntu.com-20080910041720-8c3wxgxrciqwxumq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2008-09-09 23:54:57 -0500
message:
Merge in bzr 1.7rc1, open 1.8 for development
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3686.10.2
revision-id: pqm at pqm.ubuntu.com-20080910041720-8c3wxgxrciqwxumq
parent: pqm at pqm.ubuntu.com-20080909220719-o6ma8z56i4er1htl
parent: john at arbash-meinel.com-20080910034639-peesekud7vl6cpty
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.7
timestamp: Wed 2008-09-10 05:17:20 +0100
message:
Fix up NEWS for 1.7rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3686.11.1
revision-id: john at arbash-meinel.com-20080910034639-peesekud7vl6cpty
parent: pqm at pqm.ubuntu.com-20080909220719-o6ma8z56i4er1htl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2008-09-09 22:46:39 -0500
message:
Fix NEWS for proper 1.7rc1 release.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3686.10.1
revision-id: pqm at pqm.ubuntu.com-20080909220719-o6ma8z56i4er1htl
parent: pqm at pqm.ubuntu.com-20080909173348-5y4vo2tga9d19fpa
parent: john at arbash-meinel.com-20080909212730-xka2luwpzvz2o4f0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.7
timestamp: Tue 2008-09-09 23:07:19 +0100
message:
(jam) Prepare 1.7rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3686.9.1
revision-id: john at arbash-meinel.com-20080909212730-xka2luwpzvz2o4f0
parent: pqm at pqm.ubuntu.com-20080909173348-5y4vo2tga9d19fpa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2008-09-09 16:27:30 -0500
message:
Prepare 1.7rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3686.1.11
revision-id: pqm at pqm.ubuntu.com-20080909173348-5y4vo2tga9d19fpa
parent: pqm at pqm.ubuntu.com-20080908061835-nz7hj7o0pms1nf9p
parent: john at arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-09-09 18:33:48 +0100
message:
(Mark Hammond) Update bzr.ico, and include TBZR icons in installer.
modified:
bzr.ico bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3686.8.3
revision-id: john at arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
parent: mhammond at skippinet.com.au-20080904120301-x3tujl7hloy0o75j
author: Mark Hammond <mhammond at skippinet.com.au>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2008-09-09 12:02:21 -0500
message:
An updated transparent icon for bzr.
modified:
bzr.ico bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
------------------------------------------------------------
revno: 3686.8.2
revision-id: mhammond at skippinet.com.au-20080904120301-x3tujl7hloy0o75j
parent: mhammond at skippinet.com.au-20080904115040-ai5yum99nqz0azz2
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.binaries.17
timestamp: Thu 2008-09-04 22:03:01 +1000
message:
build the list of icons without changing directory.
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3686.8.1
revision-id: mhammond at skippinet.com.au-20080904115040-ai5yum99nqz0azz2
parent: pqm at pqm.ubuntu.com-20080903223056-b108iytb38xkznci
parent: mhammond at skippinet.com.au-20080903120907-0cgb5efq1gzhsh0b
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.binaries.17
timestamp: Thu 2008-09-04 21:50:40 +1000
message:
re-merge
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3684.2.1
revision-id: mhammond at skippinet.com.au-20080903120907-0cgb5efq1gzhsh0b
parent: pqm at pqm.ubuntu.com-20080903094659-lkj3i4hd83d35fov
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.binaries.17
timestamp: Wed 2008-09-03 22:09:07 +1000
message:
include tbzr icons in windows binary distributions
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3686.1.10
revision-id: pqm at pqm.ubuntu.com-20080908061835-nz7hj7o0pms1nf9p
parent: pqm at pqm.ubuntu.com-20080906102539-ss1fkx2csdcalqlc
parent: andrew.bennetts at canonical.com-20080908054927-q84h4v1c8dy91h92
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-09-08 07:18:35 +0100
message:
(trivial) Remove some unused imports,
fix two trivially broken raise statements. (Andrew Bennetts)
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
------------------------------------------------------------
revno: 3686.7.1
revision-id: andrew.bennetts at canonical.com-20080908054927-q84h4v1c8dy91h92
parent: pqm at pqm.ubuntu.com-20080906102539-ss1fkx2csdcalqlc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: trivial
timestamp: Mon 2008-09-08 15:49:27 +1000
message:
Remove some unused imports and fix a couple of trivially broken raise statements.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
------------------------------------------------------------
revno: 3686.1.9
revision-id: pqm at pqm.ubuntu.com-20080906102539-ss1fkx2csdcalqlc
parent: pqm at pqm.ubuntu.com-20080905215441-14uu1ybru8397sy2
parent: andrew.bennetts at canonical.com-20080906095218-9k920hp0t6h9bif0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-09-06 11:25:39 +0100
message:
Do not traceback on unexpected error responses from a smart server.
(Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3686.6.2
revision-id: andrew.bennetts at canonical.com-20080906095218-9k920hp0t6h9bif0
parent: andrew.bennetts at canonical.com-20080905055253-lxvnx1ga91wxrxyj
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: nicer-error
timestamp: Sat 2008-09-06 19:52:18 +1000
message:
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3686.6.1
revision-id: andrew.bennetts at canonical.com-20080905055253-lxvnx1ga91wxrxyj
parent: pqm at pqm.ubuntu.com-20080904180441-gssfmn0j6yw2vi0e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: nicer-error
timestamp: Fri 2008-09-05 15:52:53 +1000
message:
Unexpected error responses from a smart server no longer cause the client to traceback.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3686.1.8
revision-id: pqm at pqm.ubuntu.com-20080905215441-14uu1ybru8397sy2
parent: pqm at pqm.ubuntu.com-20080905212548-ig8wqqpv4vb8b2v4
parent: john at arbash-meinel.com-20080905201406-p6mf9wt3r38l5dxq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-09-05 22:54:41 +0100
message:
(jam) Merge in bzr 1.6.1 release
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3686.5.1
revision-id: john at arbash-meinel.com-20080905201406-p6mf9wt3r38l5dxq
parent: pqm at pqm.ubuntu.com-20080903223056-b108iytb38xkznci
parent: pqm at pqm.ubuntu.com-20080905195323-3gadc8dfqs61vy4e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-09-05 15:14:06 -0500
message:
Merge in bzr 1.6.1 release
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3606.5.17
revision-id: pqm at pqm.ubuntu.com-20080905195323-3gadc8dfqs61vy4e
parent: pqm at pqm.ubuntu.com-20080903164846-k1lc4d87315m26uh
parent: john at arbash-meinel.com-20080905192332-4j7a025l28ba26xk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Fri 2008-09-05 20:53:23 +0100
message:
(jam) Release bzr 1.6.1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.16.1
revision-id: john at arbash-meinel.com-20080905192332-4j7a025l28ba26xk
parent: pqm at pqm.ubuntu.com-20080903164846-k1lc4d87315m26uh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-09-05 14:23:32 -0500
message:
Release bzr 1.6.1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3686.1.7
revision-id: pqm at pqm.ubuntu.com-20080905212548-ig8wqqpv4vb8b2v4
parent: pqm at pqm.ubuntu.com-20080905055502-uq3g4uwzl6agbyy4
parent: andrew.bennetts at canonical.com-20080905104803-6g72dz6wcldosfs2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-09-05 22:25:48 +0100
message:
(spiv) Fix bug #237067 by having RemoteBranch properly lock its
RemoteRepository.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3686.4.6
revision-id: andrew.bennetts at canonical.com-20080905104803-6g72dz6wcldosfs2
parent: andrew.bennetts at canonical.com-20080905102540-118qgqvl1a6nt019
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: objectnotlocked
timestamp: Fri 2008-09-05 20:48:03 +1000
message:
Remove monkey-patching of branch._ensure_real from test_remote.py.
modified:
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3686.4.5
revision-id: andrew.bennetts at canonical.com-20080905102540-118qgqvl1a6nt019
parent: andrew.bennetts at canonical.com-20080905102129-a7v2uzv07tdo495e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: objectnotlocked
timestamp: Fri 2008-09-05 20:25:40 +1000
message:
Fix bug revealed by removing _ensure_real call from RemoteBranch.lock_write.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3686.4.4
revision-id: andrew.bennetts at canonical.com-20080905102129-a7v2uzv07tdo495e
parent: andrew.bennetts at canonical.com-20080905101704-6g8iio31vb1wb2pf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: objectnotlocked
timestamp: Fri 2008-09-05 20:21:29 +1000
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3686.4.3
revision-id: andrew.bennetts at canonical.com-20080905101704-6g8iio31vb1wb2pf
parent: andrew.bennetts at canonical.com-20080905085529-o3abc8tnazsx2qth
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: objectnotlocked
timestamp: Fri 2008-09-05 20:17:04 +1000
message:
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3686.4.2
revision-id: andrew.bennetts at canonical.com-20080905085529-o3abc8tnazsx2qth
parent: andrew.bennetts at canonical.com-20080905083730-mobjr4wfkz8rxdcr
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: objectnotlocked
timestamp: Fri 2008-09-05 18:55:29 +1000
message:
Fix regression introduced by fix, and add a test for that regression.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
------------------------------------------------------------
revno: 3686.4.1
revision-id: andrew.bennetts at canonical.com-20080905083730-mobjr4wfkz8rxdcr
parent: pqm at pqm.ubuntu.com-20080905055502-uq3g4uwzl6agbyy4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: objectnotlocked
timestamp: Fri 2008-09-05 18:37:30 +1000
message:
Make RemoteBranch.lock_write lock the repository too.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3686.1.6
revision-id: pqm at pqm.ubuntu.com-20080905055502-uq3g4uwzl6agbyy4
parent: pqm at pqm.ubuntu.com-20080905013604-6zvq8467ip7l4m9i
parent: mbp at sourcefrog.net-20080905051235-am3gwu6qjwlgqkeo
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-09-05 06:55:02 +0100
message:
(mbp) Windows test fixes from markh
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3686.3.1
revision-id: mbp at sourcefrog.net-20080905051235-am3gwu6qjwlgqkeo
parent: pqm at pqm.ubuntu.com-20080905013604-6zvq8467ip7l4m9i
parent: mhammond at skippinet.com.au-20080815005423-x59t7pzm8igr66td
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Fri 2008-09-05 15:12:35 +1000
message:
Merge Windows test fixes
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3619.6.9
revision-id: mhammond at skippinet.com.au-20080815005423-x59t7pzm8igr66td
parent: mhammond at skippinet.com.au-20080815004504-2rzrodsu1ic8oesp
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Fri 2008-08-15 10:54:23 +1000
message:
Move check for os.link to the start of the test
modified:
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
------------------------------------------------------------
revno: 3619.6.8
revision-id: mhammond at skippinet.com.au-20080815004504-2rzrodsu1ic8oesp
parent: mhammond at skippinet.com.au-20080815004418-2s0jnsyyb7ra6an8
parent: pqm at pqm.ubuntu.com-20080814032324-mhfk4rggo7hgxeuf
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Fri 2008-08-15 10:45:04 +1000
message:
merge tip
added:
doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3619.6.7
revision-id: mhammond at skippinet.com.au-20080815004418-2s0jnsyyb7ra6an8
parent: mhammond at skippinet.com.au-20080812130700-05ohg06353nxg22q
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Fri 2008-08-15 10:44:18 +1000
message:
John asked for TestNotApplicable instead of TestSkipped when no os.link.
modified:
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
------------------------------------------------------------
revno: 3619.6.6
revision-id: mhammond at skippinet.com.au-20080812130700-05ohg06353nxg22q
parent: mhammond at skippinet.com.au-20080812130601-x1r70uyerz50h4gd
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Tue 2008-08-12 23:07:00 +1000
message:
eagerly unlock the result_basis to prevent handles staying open.
modified:
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
------------------------------------------------------------
revno: 3619.6.5
revision-id: mhammond at skippinet.com.au-20080812130601-x1r70uyerz50h4gd
parent: mhammond at skippinet.com.au-20080812113721-13deviynbqzwrul7
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Tue 2008-08-12 23:06:01 +1000
message:
ensure merge_modified() closes the hash file.
modified:
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3619.6.4
revision-id: mhammond at skippinet.com.au-20080812113721-13deviynbqzwrul7
parent: mhammond at skippinet.com.au-20080812111212-81vo1v69y1dtachv
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Tue 2008-08-12 21:37:21 +1000
message:
do_merge gets one 'finally' per lock so locks always released on failure.
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 3619.6.3
revision-id: mhammond at skippinet.com.au-20080812111212-81vo1v69y1dtachv
parent: mhammond at skippinet.com.au-20080812110839-emxho9q2id04wnr2
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Tue 2008-08-12 21:12:12 +1000
message:
ensure we aren't trying to remove the cwd, which fails on Windows.
modified:
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
------------------------------------------------------------
revno: 3619.6.2
revision-id: mhammond at skippinet.com.au-20080812110839-emxho9q2id04wnr2
parent: mhammond at skippinet.com.au-20080812110800-cib2ht1l27md0sj1
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Tue 2008-08-12 21:08:39 +1000
message:
ensure the conflict list file is closed before returning.
modified:
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3619.6.1
revision-id: mhammond at skippinet.com.au-20080812110800-cib2ht1l27md0sj1
parent: pqm at pqm.ubuntu.com-20080811083307-tbibm26paa3r4hg8
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Tue 2008-08-12 21:08:00 +1000
message:
raise TestSkipped if os.link doesn't exist.
modified:
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
------------------------------------------------------------
revno: 3686.1.5
revision-id: pqm at pqm.ubuntu.com-20080905013604-6zvq8467ip7l4m9i
parent: pqm at pqm.ubuntu.com-20080904180441-gssfmn0j6yw2vi0e
parent: mbp at sourcefrog.net-20080905010038-i94y1x0te5jktd0o
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-09-05 02:36:04 +0100
message:
Developer docs on review process and stacking
added:
doc/developers/overview.txt overview.txt-20080904022501-ww2ggomrs5elxfm0-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 3683.1.3
revision-id: mbp at sourcefrog.net-20080905010038-i94y1x0te5jktd0o
parent: mbp at sourcefrog.net-20080904053516-fs3wq4s1ezgne4jg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Fri 2008-09-05 11:00:38 +1000
message:
Update news
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3683.1.2
revision-id: mbp at sourcefrog.net-20080904053516-fs3wq4s1ezgne4jg
parent: mbp at sourcefrog.net-20080904045536-p7royuwgrixs8q4b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2008-09-04 15:35:16 +1000
message:
Developer documentation of repository stacking
modified:
doc/developers/overview.txt overview.txt-20080904022501-ww2ggomrs5elxfm0-1
------------------------------------------------------------
revno: 3683.1.1
revision-id: mbp at sourcefrog.net-20080904045536-p7royuwgrixs8q4b
parent: pqm at pqm.ubuntu.com-20080903083249-e76ygekseh1peidm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2008-09-04 14:55:36 +1000
message:
Improved review process docs and separate out architectural overview
added:
doc/developers/overview.txt overview.txt-20080904022501-ww2ggomrs5elxfm0-1
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 3686.1.4
revision-id: pqm at pqm.ubuntu.com-20080904180441-gssfmn0j6yw2vi0e
parent: pqm at pqm.ubuntu.com-20080904142234-pldim6ie032cb6am
parent: john at arbash-meinel.com-20080904173412-kfkpexgdopfwm9cz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-09-04 19:04:41 +0100
message:
(jam) Use list.append(str) instead of list += str when buffering sftp
reads.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 3686.2.2
revision-id: john at arbash-meinel.com-20080904173412-kfkpexgdopfwm9cz
parent: john at arbash-meinel.com-20080904024234-bgqpx4oupmqhv5t9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-09-04 12:34:12 -0500
message:
NEWS entry for the sftp tweak.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3686.2.1
revision-id: john at arbash-meinel.com-20080904024234-bgqpx4oupmqhv5t9
parent: pqm at pqm.ubuntu.com-20080903223056-b108iytb38xkznci
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2008-09-03 21:42:34 -0500
message:
Properly append the data to the list buffer.
Rather than using [] += 'str', use [].append(str).
It turns out both *work*, but the former adds each character
individually to the list.
modified:
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 3686.1.3
revision-id: pqm at pqm.ubuntu.com-20080904142234-pldim6ie032cb6am
parent: pqm at pqm.ubuntu.com-20080903223056-b108iytb38xkznci
parent: jelmer at samba.org-20080902195956-hg63sah1s0k7aeov
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-09-04 15:22:34 +0100
message:
(Jelmer) Deprecate Repository.revision_tree(None).
modified:
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3680.1.1
revision-id: jelmer at samba.org-20080902195956-hg63sah1s0k7aeov
parent: pqm at pqm.ubuntu.com-20080902194610-1zzkeem0cm38snju
parent: jelmer at samba.org-20080902002928-qp0m5mq97t5zm414
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2008-09-02 21:59:56 +0200
message:
Merge Repository.revision_tree(None) deprecation work.
modified:
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3668.5.4
revision-id: jelmer at samba.org-20080902002928-qp0m5mq97t5zm414
parent: jelmer at samba.org-20080901155224-1o65walig7kp0vp0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Tue 2008-09-02 02:29:28 +0200
message:
Eliminate more uses of Repository.revision_tree(None).
modified:
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
------------------------------------------------------------
revno: 3668.5.3
revision-id: jelmer at samba.org-20080901155224-1o65walig7kp0vp0
parent: jelmer at samba.org-20080901144130-77iwh6hjhupopdqk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Mon 2008-09-01 17:52:24 +0200
message:
Add test to make sure revision_tree(None) prints a deprecation warning.
modified:
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3668.5.2
revision-id: jelmer at samba.org-20080901144130-77iwh6hjhupopdqk
parent: jelmer at samba.org-20080901140334-iph5u142g49dv3zu
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Mon 2008-09-01 16:41:30 +0200
message:
Fix docstring.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3668.5.1
revision-id: jelmer at samba.org-20080901140334-iph5u142g49dv3zu
parent: pqm at pqm.ubuntu.com-20080830091000-3oibqwlrxvdpgo5l
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Mon 2008-09-01 16:03:34 +0200
message:
Use NULL_REVISION rather than None for Repository.revision_tree().
modified:
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3686.1.2
revision-id: pqm at pqm.ubuntu.com-20080903223056-b108iytb38xkznci
parent: pqm at pqm.ubuntu.com-20080903220002-hit46ycge6gqsr8l
parent: john at arbash-meinel.com-20080903213644-icayfa0cn3hq3skv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-09-03 23:30:56 +0100
message:
(jam) Streamline BTreeBuilder.add_node et al to make btree creation
faster.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3644.2.13
revision-id: john at arbash-meinel.com-20080903213644-icayfa0cn3hq3skv
parent: john at arbash-meinel.com-20080828201920-fcrvnykg1jd4rwnx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Wed 2008-09-03 16:36:44 -0500
message:
NEWS entry about the performance improvements.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3644.2.12
revision-id: john at arbash-meinel.com-20080828201920-fcrvnykg1jd4rwnx
parent: john at arbash-meinel.com-20080828201644-itfv9mmesr50lncd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Thu 2008-08-28 15:19:20 -0500
message:
Remove an incorrect comment.
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
------------------------------------------------------------
revno: 3644.2.11
revision-id: john at arbash-meinel.com-20080828201644-itfv9mmesr50lncd
parent: john at arbash-meinel.com-20080828201331-dqffxf54l2heokll
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Thu 2008-08-28 15:16:44 -0500
message:
Document the new form of _nodes and remove an unnecessary cast.
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
------------------------------------------------------------
revno: 3644.2.10
revision-id: john at arbash-meinel.com-20080828201331-dqffxf54l2heokll
parent: john at arbash-meinel.com-20080828200552-sw5lzds9mmi3qnnb
parent: pqm at pqm.ubuntu.com-20080828171745-xdrmccm17muk77y0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Thu 2008-08-28 15:13:31 -0500
message:
Merge bzr.dev 3658
added:
bzrlib/transport/ftp/ ftp-20080611185801-3vm145h8dmnfgh25-1
bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
renamed:
bzrlib/transport/ftp.py => bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
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/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
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
------------------------------------------------------------
revno: 3644.2.9
revision-id: john at arbash-meinel.com-20080828200552-sw5lzds9mmi3qnnb
parent: john at arbash-meinel.com-20080825190216-vdkyinz5p5e5s8kq
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Thu 2008-08-28 15:05:52 -0500
message:
Refactor some code.
Move the key, reference, value checking into a helper function.
This func also finds absent references, but that should have
minimal overhead either way.
Also use the _update_nodes_by_key functionality for both
indexes, as _nodes_by_key has the same signature.
Move _spill_mem_keys_to_disk into a separate function
not necessary, but it makes add_node() easier to understand.
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 3644.2.8
revision-id: john at arbash-meinel.com-20080825190216-vdkyinz5p5e5s8kq
parent: john at arbash-meinel.com-20080825183623-n5h3h1d5ky8yr7d6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Mon 2008-08-25 14:02:16 -0500
message:
Two quick tweaks.
Change _iter_mem_nodes to use sorted order.
That way we can sort purely on the 'key' which
we know is the sort key anyway. This shaves off
a *lot* of time spent in 'sorted()'.
Also, if 'references' is in our output nodes,
we know we've already checked that it is a valid
key, so we don't need to check it again.
This shaves another 600ms or so for a bzr.dev tree.
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
------------------------------------------------------------
revno: 3644.2.7
revision-id: john at arbash-meinel.com-20080825183623-n5h3h1d5ky8yr7d6
parent: john at arbash-meinel.com-20080825164422-8opo9lb960uev2ce
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Mon 2008-08-25 13:36:23 -0500
message:
Remove accidental merge
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3644.2.6
revision-id: john at arbash-meinel.com-20080825164422-8opo9lb960uev2ce
parent: john at arbash-meinel.com-20080825164250-glc5z58nhwzpgdo2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Mon 2008-08-25 11:44:22 -0500
message:
Restore the exact old tests, only assert that
_nodes_by_key is None, rather than an empty dict.
modified:
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3644.2.5
revision-id: john at arbash-meinel.com-20080825164250-glc5z58nhwzpgdo2
parent: john at arbash-meinel.com-20080825162901-1qweamxqdvv59ie9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Mon 2008-08-25 11:42:50 -0500
message:
Restore the exact old tests, only assert that
_nodes_by_key is None, rather than an empty dict.
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3644.2.4
revision-id: john at arbash-meinel.com-20080825162901-1qweamxqdvv59ie9
parent: john at arbash-meinel.com-20080825162409-0766y19zjs45m87i
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Mon 2008-08-25 11:29:01 -0500
message:
Change GraphIndex to also have a _get_nodes_by_key
modified:
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 3644.2.3
revision-id: john at arbash-meinel.com-20080825162409-0766y19zjs45m87i
parent: john at arbash-meinel.com-20080825034342-owq0858uk1wp2q0l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Mon 2008-08-25 11:24:09 -0500
message:
Do a bit more work to get all the tests to pass.
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3644.2.2
revision-id: john at arbash-meinel.com-20080825034342-owq0858uk1wp2q0l
parent: john at arbash-meinel.com-20080825034139-68nxqiqrmqi1l5f0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Sun 2008-08-24 22:43:42 -0500
message:
the new btree index doesn't have 'absent' keys in its _nodes
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
------------------------------------------------------------
revno: 3644.2.1
revision-id: john at arbash-meinel.com-20080825034139-68nxqiqrmqi1l5f0
parent: pqm at pqm.ubuntu.com-20080822042630-on3dxyek4ezk0miu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Sun 2008-08-24 22:41:39 -0500
message:
Change the IndexBuilders to not generate the nodes_by_key unless needed.
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3686.1.1
revision-id: pqm at pqm.ubuntu.com-20080903220002-hit46ycge6gqsr8l
parent: pqm at pqm.ubuntu.com-20080903205840-mteswj8dfvld7vo3
parent: john at arbash-meinel.com-20080903212915-adsuo4fmmhm9g9m3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-09-03 23:00:02 +0100
message:
(jam) (trivial) fix for documentation bug #262427
modified:
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
------------------------------------------------------------
revno: 3684.1.2
revision-id: john at arbash-meinel.com-20080903212915-adsuo4fmmhm9g9m3
parent: john at arbash-meinel.com-20080903195434-rnbmeujc0mrgm7qu
author: Xiong Chiamiov <xiong.chiamiov at gmail.com>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2008-09-03 16:29:15 -0500
message:
trivially fix doc bug #262427
modified:
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
-------------- next part --------------
Diff too large for email (2328 lines, the limit is 1000).
More information about the bazaar-commits
mailing list