Rev 1591: (mbp) pycurl bugfixes, robert's knit performance stuff in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Mar 20 10:33:14 GMT 2006
------------------------------------------------------------
revno: 1591
revision-id: pqm at pqm.ubuntu.com-20060320103311-a87ccd7ffe9ce14f
parent: pqm at pqm.ubuntu.com-20060319161404-bbeddf282f11af63
parent: mbp at sourcefrog.net-20060320095825-ed99032ef9743cc8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-03-20 10:33:11 +0000
message:
(mbp) pycurl bugfixes, robert's knit performance stuff
modified:
README README-20050309040720-8f368abf9f346b9d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weavefile.py weavefile.py-20050629135233-2ffe0200f103f6c2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320095825-ed99032ef9743cc8
parent: mbp at sourcefrog.net-20060320090242-b1e492be1b6bcb7e
parent: robertc at robertcollins.net-20060314102728-7e47b9b8cd6c3d73
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 09:58:25 +0000
message:
[merge] robert's knit-performance work
------------------------------------------------------------
merged: robertc at robertcollins.net-20060314102728-7e47b9b8cd6c3d73
parent: robertc at robertcollins.net-20060313110344-f82a10b55cba1f99
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Tue 2006-03-14 21:27:28 +1100
message:
rollback from using deltas to using fulltexts - deltas need more work to be ready.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060313110344-f82a10b55cba1f99
parent: robertc at robertcollins.net-20060313081347-2d77927bbf4385ec
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Mon 2006-03-13 22:03:44 +1100
message:
Switch to delta based content copying in the generic versioned file copier.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060313081347-2d77927bbf4385ec
parent: robertc at robertcollins.net-20060312170911-306a47e0478ec183
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Mon 2006-03-13 19:13:47 +1100
message:
add a get_delta api to versioned_file.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060312170911-306a47e0478ec183
parent: robertc at robertcollins.net-20060312161413-571daaeb22adb0bb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Mon 2006-03-13 04:09:11 +1100
message:
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060312161413-571daaeb22adb0bb
parent: robertc at robertcollins.net-20060312152823-ff909f6b65a8d4e3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Mon 2006-03-13 03:14:13 +1100
message:
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060312152823-ff909f6b65a8d4e3
parent: robertc at robertcollins.net-20060312145732-78cb2cc26ae0f578
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Mon 2006-03-13 02:28:23 +1100
message:
Do not cause construction of temporary knits when we are fetching and the target does not exist.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060312145732-78cb2cc26ae0f578
parent: robertc at robertcollins.net-20060312112830-1061d51acba96613
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Mon 2006-03-13 01:57:32 +1100
message:
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060312112830-1061d51acba96613
parent: robertc at robertcollins.net-20060311214632-85c06c12f42a7062
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 22:28:30 +1100
message:
Remove a list __contains__ usage in weave operations.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311214632-85c06c12f42a7062
parent: robertc at robertcollins.net-20060311150940-4a23f262987da902
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 08:46:32 +1100
message:
Unbreak backwards compatability on weave.get_lines.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311150940-4a23f262987da902
parent: robertc at robertcollins.net-20060311145354-84be4503f55af670
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 02:09:40 +1100
message:
Make weave.get_lines faster.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311145354-84be4503f55af670
parent: robertc at robertcollins.net-20060311135848-789fa616b8da4662
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 01:53:54 +1100
message:
more knit profile based tuning.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311135848-789fa616b8da4662
parent: robertc at robertcollins.net-20060311133519-961e7e79773ad566
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 00:58:48 +1100
message:
Note potential improvements in knit adds.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311133519-961e7e79773ad566
parent: robertc at robertcollins.net-20060311132750-96b92a1a5dc7907b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 00:35:19 +1100
message:
gzip.writelines was unreasonably slow.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311132750-96b92a1a5dc7907b
parent: robertc at robertcollins.net-20060311130748-f3920b2fe72ee9f7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 00:27:50 +1100
message:
Weave._extract should be faster
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311130748-f3920b2fe72ee9f7
parent: robertc at robertcollins.net-20060311124859-8e1f578f392625cb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sun 2006-03-12 00:07:48 +1100
message:
Gzipfile was slightly slower than ideal.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311124859-8e1f578f392625cb
parent: robertc at robertcollins.net-20060311124317-0236baa207cdca3b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 23:48:59 +1100
message:
Doh, fetch-pb-unbreak.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311124317-0236baa207cdca3b
parent: robertc at robertcollins.net-20060311110207-5377d0c9aa652eac
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 23:43:17 +1100
message:
Fetch changes to use new pb.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311110207-5377d0c9aa652eac
parent: robertc at robertcollins.net-20060311085010-9031102e3e20cfcd
parent: robertc at robertcollins.net-20060310062058-0c6fe1a592a7718b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 22:02:07 +1100
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310062058-0c6fe1a592a7718b
parent: robertc at robertcollins.net-20060310020640-3cfd354a1d3dd426
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-03-10 17:20:58 +1100
message:
Apply David Allouches list_dir quoting fix.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311085010-9031102e3e20cfcd
parent: robertc at robertcollins.net-20060311050453-ca5a7aaad2930c13
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 19:50:10 +1100
message:
optimise commit to only access weaves for merged, or altered files during commit.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060311050453-ca5a7aaad2930c13
parent: robertc at robertcollins.net-20060310221908-7c6d446b9aa88eb1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 16:04:53 +1100
message:
Shave 20% off id2path.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310221908-7c6d446b9aa88eb1
parent: robertc at robertcollins.net-20060310212204-4af1843b38ab013d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 09:19:08 +1100
message:
More microopimisations on index reading, now down to 16000 records/seconds.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310212204-4af1843b38ab013d
parent: robertc at robertcollins.net-20060310205312-287d0ea17cbbf4d8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 08:22:04 +1100
message:
Notes on further progress tuning.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310205312-287d0ea17cbbf4d8
parent: robertc at robertcollins.net-20060310202334-8c9f1bf1d93c4e89
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 07:53:12 +1100
message:
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310202334-8c9f1bf1d93c4e89
parent: robertc at robertcollins.net-20060310052614-cadfab7752cd901b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Sat 2006-03-11 07:23:34 +1100
message:
Microprofiling of knit parsing.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060310052614-cadfab7752cd901b
parent: robertc at robertcollins.net-20060309234535-c9df2babefcd1748
parent: robertc at robertcollins.net-20060310020640-3cfd354a1d3dd426
committer: Robert Collins <robertc at robertcollins.net>
branch nick: versioned-file-performance
timestamp: Fri 2006-03-10 16:26:14 +1100
message:
Make knit parsing non quadratic?
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060320090242-b1e492be1b6bcb7e
parent: pqm at pqm.ubuntu.com-20060319161404-bbeddf282f11af63
parent: mbp at sourcefrog.net-20060317124950-a2ba9b8473468c11
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Mon 2006-03-20 09:02:42 +0000
message:
[merge] my previous work, including pycurl regression
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060317124950-a2ba9b8473468c11
parent: mbp at sourcefrog.net-20060316202434-c545186fba141b8d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Fri 2006-03-17 12:49:50 +0000
message:
Fix regression of wrong superclass for TestLocationConfig
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060316202434-c545186fba141b8d
parent: mbp at sourcefrog.net-20060316202032-d044f29e7d81b333
parent: mbp at sourcefrog.net-20060316200236-36b7bbaafd2cef9a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-03-16 20:24:34 +0000
message:
[merge] pycurl
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060316202032-d044f29e7d81b333
parent: mbp at sourcefrog.net-20060316195701-aa7057ecdc25840d
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-03-16 20:20:32 +0000
message:
Update version numbers
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060316195701-aa7057ecdc25840d
parent: mbp at sourcefrog.net-20060316191429-ef69928d5ca02403
parent: michael at ellerman.id.au-20060309002448-70cce15e3d605130
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-03-16 19:57:01 +0000
message:
[merge] mpe
------------------------------------------------------------
merged: michael at ellerman.id.au-20060309002448-70cce15e3d605130
parent: michael at ellerman.id.au-20060308055936-2fc80d3331e44e34
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Thu 2006-03-09 11:24:48 +1100
message:
Make the "ignore line" in the commit message editor the "right" width, so
that if you make your message that wide it won't wrap in bzr log output.
Just as a visual aid.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060308055936-2fc80d3331e44e34
parent: michael at ellerman.id.au-20060307101736-05dc6e9314566d0c
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Wed 2006-03-08 16:59:36 +1100
message:
Define __str__ for BranchFormat, just return the format string with the
trailing newline stripped. Override __str__ for BranchFormat4 because
it doesn't have a format string. This fixes ugliness in the UI where
people print branch._format, bzr check for one. Fixes bug #33453.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060307101736-05dc6e9314566d0c
parent: michael at ellerman.id.au-20060228091909-c5d7bc5a186b8a55
parent: pqm at pqm.ubuntu.com-20060307013022-b9258d2a0c135498
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Tue 2006-03-07 21:17:36 +1100
message:
Merge mainline.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060228091909-c5d7bc5a186b8a55
parent: michael at ellerman.id.au-20060228091032-cb4a4a6e5e4d7df6
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Tue 2006-02-28 20:19:09 +1100
message:
Remove double class definition of TestLocationConfig. This causes another
26 tests to be run, all of which pass.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060228091032-cb4a4a6e5e4d7df6
parent: michael at ellerman.id.au-20060228083521-15796152a3f1cbb4
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Tue 2006-02-28 20:10:32 +1100
message:
Produce an intelligible error if the user's /etc/passwd is not encoded in
UTF-8 and we're trying to decode it as UTF-8. This fixes bug 3452.
------------------------------------------------------------
merged: michael at ellerman.id.au-20060228083521-15796152a3f1cbb4
parent: michael at ellerman.id.au-20060216005059-dde4ec75b1b58ebf
parent: pqm at pqm.ubuntu.com-20060228043846-eb79299c08edb05c
committer: Michael Ellerman <michael at ellerman.id.au>
branch nick: mpe
timestamp: Tue 2006-02-28 19:35:21 +1100
message:
Merge mainline
More information about the bazaar-commits
mailing list