Rev 3650: merge bzr.dev at 3655 in file:///v/home/vila/src/bzr/experimental/faster-selftest/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Thu Aug 28 15:18:47 BST 2008
At file:///v/home/vila/src/bzr/experimental/faster-selftest/
------------------------------------------------------------
revno: 3650
revision-id: v.ladeuil+lp at free.fr-20080828141840-9s90i6j64s6958dq
parent: pqm at pqm.ubuntu.com-20080825182248-dydy5bn4n5akbfjq
parent: pqm at pqm.ubuntu.com-20080828092217-98wmtek2p8cie8sc
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: selftest-prefixes
timestamp: Thu 2008-08-28 16:18:40 +0200
message:
merge bzr.dev at 3655
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
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/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3649.3.6
revision-id: pqm at pqm.ubuntu.com-20080828092217-98wmtek2p8cie8sc
parent: pqm at pqm.ubuntu.com-20080828063210-o4du3ibqwr46bd1f
parent: v.ladeuil+lp at free.fr-20080828083226-bwo4amdhmp4caw0t
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-28 10:22:17 +0100
message:
(vila) Fix bug #225020 by catching CURLE_SEND_ERROR
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
------------------------------------------------------------
revno: 3649.6.1
revision-id: v.ladeuil+lp at free.fr-20080828083226-bwo4amdhmp4caw0t
parent: pqm at pqm.ubuntu.com-20080828063210-o4du3ibqwr46bd1f
parent: v.ladeuil+lp at free.fr-20080827202611-8l16umo6ylc4rbnw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2008-08-28 10:32:26 +0200
message:
Fix bug #225020 by catching CURLE_SEND_ERROR
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
------------------------------------------------------------
revno: 3649.5.1
revision-id: v.ladeuil+lp at free.fr-20080827202611-8l16umo6ylc4rbnw
parent: pqm at pqm.ubuntu.com-20080827044137-4ox67ehr4bxtj7b0
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 225020-select-poll
timestamp: Wed 2008-08-27 22:26:11 +0200
message:
Fix bug #225020 by catching CURLE_SEND_ERROR error.
* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._post): There is a race condition between
HTTP/1.0 servers refusing a POST request and the curl library
trying to send the body request anyway. In rare occurrences, the
connection is already closed.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
------------------------------------------------------------
revno: 3649.3.5
revision-id: pqm at pqm.ubuntu.com-20080828063210-o4du3ibqwr46bd1f
parent: pqm at pqm.ubuntu.com-20080828030104-6a87mmhafprj1prs
parent: robertc at robertcollins.net-20080814030008-r6b2xviv7a4fy5ti
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-28 07:32:10 +0100
message:
(robertc) Update plugin module docstring. (Robert Collins)
modified:
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
------------------------------------------------------------
revno: 3620.4.1
revision-id: robertc at robertcollins.net-20080814030008-r6b2xviv7a4fy5ti
parent: pqm at pqm.ubuntu.com-20080812201855-9qxbdo0t2h9byzhj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Thu 2008-08-14 13:00:08 +1000
message:
plugin doc strings update.
modified:
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
------------------------------------------------------------
revno: 3649.3.4
revision-id: pqm at pqm.ubuntu.com-20080828030104-6a87mmhafprj1prs
parent: pqm at pqm.ubuntu.com-20080828023029-r2qwgt7zu9udtla3
parent: john at arbash-meinel.com-20080828021558-5ek9vno64yv7yx96
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-28 04:01:04 +0100
message:
(jam) Updates to the btree indexing code.
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
bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
------------------------------------------------------------
revno: 3641.5.19
revision-id: john at arbash-meinel.com-20080828021558-5ek9vno64yv7yx96
parent: john at arbash-meinel.com-20080828015958-bvdt8spf2ls57s39
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-27 21:15:58 -0500
message:
Documentation cleanup pass.
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3641.5.18
revision-id: john at arbash-meinel.com-20080828015958-bvdt8spf2ls57s39
parent: john at arbash-meinel.com-20080826005610-275jq9uqje3prqry
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Wed 2008-08-27 20:59:58 -0500
message:
Clean out the global state, good for prototyping and tuning, bad for production code.
(as recommended by Robert)
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3641.5.17
revision-id: john at arbash-meinel.com-20080826005610-275jq9uqje3prqry
parent: john at arbash-meinel.com-20080826004207-0kp25c5a3z3rsd9t
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Mon 2008-08-25 19:56:10 -0500
message:
Fix up the test suite now that things don't pack as well.
modified:
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3641.5.16
revision-id: john at arbash-meinel.com-20080826004207-0kp25c5a3z3rsd9t
parent: john at arbash-meinel.com-20080826002330-3ulihyk5qxd6b3dw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Mon 2008-08-25 19:42:07 -0500
message:
More benchmarks.
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3641.5.15
revision-id: john at arbash-meinel.com-20080826002330-3ulihyk5qxd6b3dw
parent: john at arbash-meinel.com-20080826001009-16cw7yc88rix9hai
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Mon 2008-08-25 19:23:30 -0500
message:
and some new timings for bzr.dev and zsync
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3641.5.14
revision-id: john at arbash-meinel.com-20080826001009-16cw7yc88rix9hai
parent: john at arbash-meinel.com-20080825200333-s1s2d3fq4oq9igm7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Mon 2008-08-25 19:10:09 -0500
message:
Some benchmark updates
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3641.5.13
revision-id: john at arbash-meinel.com-20080825200333-s1s2d3fq4oq9igm7
parent: john at arbash-meinel.com-20080823174752-qfy5puc1pta4jexo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Mon 2008-08-25 15:03:33 -0500
message:
Include some timing on msyql, which has different
characteristics. Probably because the compression ratio is higher.
(avg 7:1 rather than 5:1 for bzr.dev). Probably because the
converter used more compressible ids.
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3641.5.12
revision-id: john at arbash-meinel.com-20080823174752-qfy5puc1pta4jexo
parent: john at arbash-meinel.com-20080823005634-tmjvmlbaf4hmhzwj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Sat 2008-08-23 12:47:52 -0500
message:
Play around with max_repack=0 and limiting work done based on
the number of ZSYNC_FLUSH calls. We can shave 1s/7.5s by doing this,
though we end up with probably a 20% increase in storage size
(for the reasonable values, for Z_SYNC=0 we can get 3x storage size)
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3641.5.11
revision-id: john at arbash-meinel.com-20080823005634-tmjvmlbaf4hmhzwj
parent: john at arbash-meinel.com-20080823005056-r2ccmi0zrbuvj0mb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Fri 2008-08-22 19:56:34 -0500
message:
Some small test cleanup
modified:
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3641.5.10
revision-id: john at arbash-meinel.com-20080823005056-r2ccmi0zrbuvj0mb
parent: john at arbash-meinel.com-20080822211125-p9bmwrug1j4ann6d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Fri 2008-08-22 19:50:56 -0500
message:
Only Z_SYNC_FLUSH when we have extra bytes.
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3641.5.9
revision-id: john at arbash-meinel.com-20080822211125-p9bmwrug1j4ann6d
parent: john at arbash-meinel.com-20080822210515-f8qwnjnpqk560gly
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Fri 2008-08-22 16:11:25 -0500
message:
Shrink the page size so that the three_level and iter_all
tests don't have to use so many keys to get a three-level index.
modified:
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3641.5.8
revision-id: john at arbash-meinel.com-20080822210515-f8qwnjnpqk560gly
parent: john at arbash-meinel.com-20080822205059-xrra00puh3onekbi
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Fri 2008-08-22 16:05:15 -0500
message:
Fix up the test suite, now that we pack more efficiently.
Unfortunately, that means upping the node count for the iter_all and
three_level tests.
modified:
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
------------------------------------------------------------
revno: 3641.5.7
revision-id: john at arbash-meinel.com-20080822205059-xrra00puh3onekbi
parent: john at arbash-meinel.com-20080822205036-7el97kr85o0atqit
parent: pqm at pqm.ubuntu.com-20080822042630-on3dxyek4ezk0miu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Fri 2008-08-22 15:50:59 -0500
message:
Merge in bzr.dev to get the pyrex update
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_btree_serializer_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
------------------------------------------------------------
revno: 3641.5.6
revision-id: john at arbash-meinel.com-20080822205036-7el97kr85o0atqit
parent: john at arbash-meinel.com-20080822203551-cnz8r1hpi4wyfamh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Fri 2008-08-22 15:50:36 -0500
message:
Include the benchmarks for the new estimator.
All around, it seems to do a much better job. A bit faster, and a bit smaller.
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3641.5.5
revision-id: john at arbash-meinel.com-20080822203551-cnz8r1hpi4wyfamh
parent: john at arbash-meinel.com-20080822203320-y98xykrjms4r5goj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Fri 2008-08-22 15:35:51 -0500
message:
Document my attempt to use copy() as a look-ahead.
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3641.5.4
revision-id: john at arbash-meinel.com-20080822203320-y98xykrjms4r5goj
parent: john at arbash-meinel.com-20080822055444-5kcr0csbbvkqbbiw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Fri 2008-08-22 15:33:20 -0500
message:
Using a different safety margin for the first repack,
and using 2 repacks gives us effectively the same result, while
still making it safe for arbitary data. (With 1-repack, it does
effect the results 3-5%, and with 2-repacks the second margin
gives the same results.
Also, we now can get about 2-3:1 of lines that are 'blindly' added versus
ones which are added with a SYNC.
modified:
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
------------------------------------------------------------
revno: 3641.5.3
revision-id: john at arbash-meinel.com-20080822055444-5kcr0csbbvkqbbiw
parent: john at arbash-meinel.com-20080822054012-ikrwmq9nm2q4h6q8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Fri 2008-08-22 00:54:44 -0500
message:
If we repack earlier, it catches this case.
Still need to fix the other tests, but at least
the too_much test passes now.
Impact on real-world results is measurable
(2-3% final compression). Is it worth it?
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: 3641.5.2
revision-id: john at arbash-meinel.com-20080822054012-ikrwmq9nm2q4h6q8
parent: john at arbash-meinel.com-20080822035819-yx19e7qxdvjgaeql
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Fri 2008-08-22 00:40:12 -0500
message:
(broken, but hopeful) Change the compact logic.
Instead of only paying attention to the total bytes read,
use the fact that we *know* some of that is already compressed well.
So instead, we just pay attention to the bytes that are added since
the last sync. This means we Z_SYNC_FLUSH much less often.
(After syncing, we end up with more room to add without syncing.)
This improves both the time to compress and the final compressed
size. Need to update tests with the new offsets.
Also, we seem to have found a case where using Z_SYNC_FLUSH
in the middle of a stream will actually generate *better*
compression than compressing the whole stream in one pass.
test_too_much_data_does_not_exceed_size triggers this.
It *can* be packed in more than 100 bytes less than the
amount given by a full compress.
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: 3641.5.1
revision-id: john at arbash-meinel.com-20080822035819-yx19e7qxdvjgaeql
parent: john at arbash-meinel.com-20080822022908-420tr0519tdz6pxy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: btree
timestamp: Thu 2008-08-21 22:58:19 -0500
message:
Update the stats for the current code layout.
This shows why I like _max_repack=2 so much. It is
the highest value that has 'no waste'.
At _max_repack=2, you can always sneak in 1 more
line, which avoids triggering an extra repack.
Also, updating the timings with the current tuning.
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: 3649.3.3
revision-id: pqm at pqm.ubuntu.com-20080828023029-r2qwgt7zu9udtla3
parent: pqm at pqm.ubuntu.com-20080827044137-4ox67ehr4bxtj7b0
parent: robertc at robertcollins.net-20080828015504-19de8uda9gpi4x51
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-28 03:30:29 +0100
message:
(robertc) Permit filtering of log output by plugins. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3642.1.8
revision-id: robertc at robertcollins.net-20080828015504-19de8uda9gpi4x51
parent: robertc at robertcollins.net-20080828012759-4m8ng541gnk2d6b9
parent: pqm at pqm.ubuntu.com-20080827044137-4ox67ehr4bxtj7b0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2008-08-28 11:55:04 +1000
message:
Resolve conflicts in NEWS.
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/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
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/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
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
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3642.1.7
revision-id: robertc at robertcollins.net-20080828012759-4m8ng541gnk2d6b9
parent: robertc at robertcollins.net-20080821042736-742hdcpes9e8p5b5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: log
timestamp: Thu 2008-08-28 11:27:59 +1000
message:
Review feedback.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3642.1.6
revision-id: robertc at robertcollins.net-20080821042736-742hdcpes9e8p5b5
parent: robertc at robertcollins.net-20080821041202-typ3c7u8e67xlgst
committer: Robert Collins <robertc at robertcollins.net>
branch nick: log
timestamp: Thu 2008-08-21 14:27:36 +1000
message:
Make log revision filtering pluggable.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3642.1.5
revision-id: robertc at robertcollins.net-20080821041202-typ3c7u8e67xlgst
parent: robertc at robertcollins.net-20080821024338-palsst8qcdzzdob0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: log
timestamp: Thu 2008-08-21 14:12:02 +1000
message:
Separate out batching of revisions.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3642.1.4
revision-id: robertc at robertcollins.net-20080821024338-palsst8qcdzzdob0
parent: robertc at robertcollins.net-20080821023225-4vhy9yq7884myw3c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: log
timestamp: Thu 2008-08-21 12:43:38 +1000
message:
Factor out revision object extraction from revision batching.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3642.1.3
revision-id: robertc at robertcollins.net-20080821023225-4vhy9yq7884myw3c
parent: robertc at robertcollins.net-20080821020100-hnqht1b4wt0ixqqp
committer: Robert Collins <robertc at robertcollins.net>
branch nick: log
timestamp: Thu 2008-08-21 12:32:25 +1000
message:
Split out delta generation from revision content reading, and structure it after message evaluation, increasing performance of log -v -m.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3642.1.2
revision-id: robertc at robertcollins.net-20080821020100-hnqht1b4wt0ixqqp
parent: robertc at robertcollins.net-20080821014143-0gabznzvn10vv3sl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: log
timestamp: Thu 2008-08-21 12:01:00 +1000
message:
Setup a log iterator that more closely matches what the code tries to do with repository operations.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3642.1.1
revision-id: robertc at robertcollins.net-20080821014143-0gabznzvn10vv3sl
parent: pqm at pqm.ubuntu.com-20080820164550-e4vt9gdxv8hlic7n
committer: Robert Collins <robertc at robertcollins.net>
branch nick: log
timestamp: Thu 2008-08-21 11:41:43 +1000
message:
Refactoring in log towards more pluggable revision selection.
modified:
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3649.3.2
revision-id: pqm at pqm.ubuntu.com-20080827044137-4ox67ehr4bxtj7b0
parent: pqm at pqm.ubuntu.com-20080826151717-xb3qgwv6xta124k7
parent: aaron at aaronbentley.com-20080827040747-esn1l6aw5zt03sx6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-08-27 05:41:37 +0100
message:
Handle references to line data in _patiencediff_c.c properly (Lalinský)
modified:
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3649.4.1
revision-id: aaron at aaronbentley.com-20080827040747-esn1l6aw5zt03sx6
parent: pqm at pqm.ubuntu.com-20080826151717-xb3qgwv6xta124k7
parent: lalinsky at gmail.com-20080823130624-rvbasutb8urxkamy
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzr.ab.integration
timestamp: Wed 2008-08-27 00:07:47 -0400
message:
Merge patiencediff fix from Lukáš
modified:
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3628.1.3
revision-id: lalinsky at gmail.com-20080823130624-rvbasutb8urxkamy
parent: lalinsky at gmail.com-20080817193954-xtx7t19otspm7aac
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: patiencediff-refs
timestamp: Sat 2008-08-23 15:06:24 +0200
message:
Add a test
modified:
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
revno: 3628.1.2
revision-id: lalinsky at gmail.com-20080817193954-xtx7t19otspm7aac
parent: lalinsky at gmail.com-20080817193103-nph9o92j2177iq96
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: patiencediff-refs
timestamp: Sun 2008-08-17 21:39:54 +0200
message:
Actually free the data in delete_lines
modified:
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
------------------------------------------------------------
revno: 3628.1.1
revision-id: lalinsky at gmail.com-20080817193103-nph9o92j2177iq96
parent: pqm at pqm.ubuntu.com-20080814042250-v7qws60l3fjwelb1
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: patiencediff-refs
timestamp: Sun 2008-08-17 21:31:03 +0200
message:
Handle references to line data in _patiencediff_c.c properly
This code is called in bzrlib only with lists or tuples of strings, which works fine, because PySequence_Fast always returns the same object and so the items from PySequence_Fast_GET_ITEM will not be deleted until the original sequence is deleted. But if it's called with a sequence than needs to be converted to list (e.g. PyUnicode), the items will be garbage collected in the contructor and still used later in code (which leads to segfaults).
modified:
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
------------------------------------------------------------
revno: 3649.3.1
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: 3649.2.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: 3649.1.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
-------------- next part --------------
Diff too large for email (1180 lines, the limit is 1000).
More information about the bazaar-commits
mailing list