Rev 1576: Merge knit performance stage 1. in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu Mar 9 06:39:15 GMT 2006


------------------------------------------------------------
revno: 1576
revision-id: pqm at pqm.ubuntu.com-20060309063913-6d8ce700706d0802
parent: pqm at pqm.ubuntu.com-20060308164921-68f071c6df0938ab
parent: robertc at robertcollins.net-20060309061524-74c42a273f335e85
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-09 06:39:13 +0000
message:
  Merge knit performance stage 1.
modified:
  BRANCH.TODO                    BRANCH.TODO-20060103052123-79ac4969351c03a9
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/graph.py                graph.py-20050905070950-b47dce53236c5e48
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
  bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/store/revision/knit.py  knit.py-20060303020652-de5fa299e941a3c7
  bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
  bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
  bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
  bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
  bzrlib/tests/test_store.py     teststore.py-20050826022702-f6caadb647395769
  bzrlib/tests/test_transactions.py testtransaction.py-20051006222840-1f55858f890d4b0a
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  bzrlib/tests/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
  bzrlib/transactions.py         transactions.py-20051007010900-f1313d53cf58e223
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/http.py       http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309061524-74c42a273f335e85
    parent: robertc at robertcollins.net-20060309054328-23926605c7f00af4
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2006-03-09 17:15:24 +1100
    message:
      Missing needs a write lock sometimes.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309054328-23926605c7f00af4
    parent: robertc at robertcollins.net-20060309034628-599a577ccb72bcbd
    parent: robertc at robertcollins.net-20060309054147-017c0cb94e0f5c50
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2006-03-09 16:43:28 +1100
    message:
      Merge in trivial versioned file performance improvements.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309054147-017c0cb94e0f5c50
    parent: robertc at robertcollins.net-20060309053652-a47566f34ccd1408
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Thu 2006-03-09 16:41:47 +1100
    message:
      Take out appropriate locks for missing.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309053652-a47566f34ccd1408
    parent: robertc at robertcollins.net-20060309053504-d1fe995266ac87d3
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Thu 2006-03-09 16:36:52 +1100
    message:
      Bugfix knit caching implementation.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309053504-d1fe995266ac87d3
    parent: robertc at robertcollins.net-20060309045421-b3c91fa905a6bcbb
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Thu 2006-03-09 16:35:04 +1100
    message:
      Change urllib ranges implementation to be one coalesced range per http request.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309045421-b3c91fa905a6bcbb
    parent: robertc at robertcollins.net-20060309045303-af8dd39bb3160105
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Thu 2006-03-09 15:54:21 +1100
    message:
      Bugfix error message output in knit error raising.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309045303-af8dd39bb3160105
    parent: robertc at robertcollins.net-20060309041000-1c548ec87c8c67ac
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Thu 2006-03-09 15:53:03 +1100
    message:
      make trivial ranges work for HTTP really.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309041000-1c548ec87c8c67ac
    parent: robertc at robertcollins.net-20060308225050-5f1c946d31f34cf8
    parent: robertc at robertcollins.net-20060309032752-3570fbe40bb2b7a2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Thu 2006-03-09 15:10:00 +1100
    message:
      Merge transaction finalisation and ensure iter_lines_added_or_present in knits does a old-to-new read in the knit.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309032752-3570fbe40bb2b7a2
    parent: robertc at robertcollins.net-20060309005901-c7aa8978ce956f1a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: transaction-finished-callback
    timestamp: Thu 2006-03-09 14:27:52 +1100
    message:
      Make use of the transaction finalisation warning support to implement in-knit caching.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309005901-c7aa8978ce956f1a
    parent: robertc at robertcollins.net-20060309001620-609b702f53900cc2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: transaction-finished-callback
    timestamp: Thu 2006-03-09 11:59:01 +1100
    message:
      Test versioned file storage handling of clean/dirty status for accessed versioned files.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309001620-609b702f53900cc2
    parent: robertc at robertcollins.net-20060309000704-444c75bb39877694
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: transaction-finished-callback
    timestamp: Thu 2006-03-09 11:16:20 +1100
    message:
      Ensure that lockable files calls finish() on transactions.:
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309000704-444c75bb39877694
    parent: robertc at robertcollins.net-20060308235107-132ff5c36aa082a5
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: transaction-finished-callback
    timestamp: Thu 2006-03-09 11:07:04 +1100
    message:
      Teach versioned files to prevent mutation after finishing.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308235107-132ff5c36aa082a5
    parent: robertc at robertcollins.net-20060308225050-5f1c946d31f34cf8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: transaction-finished-callback
    timestamp: Thu 2006-03-09 10:51:07 +1100
    message:
      Add finished() notifications to transactions.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308225050-5f1c946d31f34cf8
    parent: robertc at robertcollins.net-20060308153913-c63fcfdfa0ca854c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Thu 2006-03-09 09:50:50 +1100
    message:
      More coalescing tweaks, and knit feedback.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308153913-c63fcfdfa0ca854c
    parent: robertc at robertcollins.net-20060308153516-7aa9172d8b28bdc3
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Thu 2006-03-09 02:39:13 +1100
    message:
      Really do incremental index status.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308153516-7aa9172d8b28bdc3
    parent: robertc at robertcollins.net-20060308144513-84f34693cfa296c7
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Thu 2006-03-09 02:35:16 +1100
    message:
      Better readv coalescing, now with test, and progress during knit index reading.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308144513-84f34693cfa296c7
    parent: robertc at robertcollins.net-20060308141600-8a7a12519e164d96
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Thu 2006-03-09 01:45:13 +1100
    message:
      Coalesce readv requests on file based transports.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308141600-8a7a12519e164d96
    parent: robertc at robertcollins.net-20060308125747-6e30e6743bbd9f7a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Thu 2006-03-09 01:16:00 +1100
    message:
      Unfuck performance.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308125747-6e30e6743bbd9f7a
    parent: robertc at robertcollins.net-20060308124446-3c5580013ecedac1
    parent: robertc at robertcollins.net-20060308025107-012d51f27c62e57f
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Wed 2006-03-08 23:57:47 +1100
    message:
      Merge from bzr.dev.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308025107-012d51f27c62e57f
    parent: pqm at pqm.ubuntu.com-20060308003741-08afccbf89005e87
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2006-03-08 13:51:07 +1100
    message:
      Fix BzrDir.open_containing of unsupported branches.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308124446-3c5580013ecedac1
    parent: robertc at robertcollins.net-20060308124232-c972294a8f230c67
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Wed 2006-03-08 23:44:46 +1100
    message:
      update setup.py.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308124232-c972294a8f230c67
    parent: robertc at robertcollins.net-20060308123422-b1f4085b4b9f0c56
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Wed 2006-03-08 23:42:32 +1100
    message:
      Update BRANCH.TODO
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308123422-b1f4085b4b9f0c56
    parent: robertc at robertcollins.net-20060308122059-c7c82607aa66a217
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Wed 2006-03-08 23:34:22 +1100
    message:
      Setup fast-code paths for copying into empty weaves and weave->empty knit.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308122059-c7c82607aa66a217
    parent: robertc at robertcollins.net-20060308110806-33bb492eeaf0a832
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Wed 2006-03-08 23:20:59 +1100
    message:
      Teach knit fetching and branching to only duplicate relevant data avoiding unnecessary reconciles.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308110806-33bb492eeaf0a832
    parent: robertc at robertcollins.net-20060308095544-eb1e0120f0c0cf33
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Wed 2006-03-08 22:08:06 +1100
    message:
      Teach Knit repositories how to handle ghosts without corrupting at all.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308095544-eb1e0120f0c0cf33
    parent: robertc at robertcollins.net-20060308070347-df89b46b3b5cf86a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Wed 2006-03-08 20:55:44 +1100
    message:
      add ghost aware apis to knits.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308070347-df89b46b3b5cf86a
    parent: robertc at robertcollins.net-20060308045920-ecdaf527c1095d76
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Wed 2006-03-08 18:03:47 +1100
    message:
      Add versionedfile.fix_parents api for correcting data post hoc.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308045920-ecdaf527c1095d76
    parent: robertc at robertcollins.net-20060308021222-a44f01d96ece809e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Wed 2006-03-08 15:59:20 +1100
    message:
      Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060308021222-a44f01d96ece809e
    parent: robertc at robertcollins.net-20060308002004-a9950b2fb75d14de
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Wed 2006-03-08 13:12:22 +1100
    message:
      Readv patch from Johan Rydberg giving knits partial download support.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309034628-599a577ccb72bcbd
    parent: robertc at robertcollins.net-20060309031724-e1d63dd8a0121a58
    parent: robertc at robertcollins.net-20060309032752-3570fbe40bb2b7a2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2006-03-09 14:46:28 +1100
    message:
      Merge transaction-finished-callback work.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309031724-e1d63dd8a0121a58
    parent: robertc at robertcollins.net-20060309023701-bac4fa080616d3f7
    parent: robertc at robertcollins.net-20060308225050-5f1c946d31f34cf8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2006-03-09 14:17:24 +1100
    message:
      Merge knit performance stage 1.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309023701-bac4fa080616d3f7
    parent: robertc at robertcollins.net-20060308025107-012d51f27c62e57f
    parent: pqm at pqm.ubuntu.com-20060308164921-68f071c6df0938ab
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2006-03-09 13:37:01 +1100
    message:
      Merge bzr.dev



More information about the bazaar-commits mailing list