Rev 3515: (robertc) Teach KnitVersionedFiles how to stack on other in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Tue Jul 1 05:21:33 BST 2008


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3515
revision-id:pqm at pqm.ubuntu.com-20080701042123-zcmqzb7o6znwjx34
parent: pqm at pqm.ubuntu.com-20080630055535-42tx43kb228k4p94
parent: robertc at robertcollins.net-20080701034954-5r0c28cocphgv6td
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-07-01 05:21:23 +0100
message:
  (robertc) Teach KnitVersionedFiles how to stack on other
  	VersionedFile objects. (Robert Collins)
modified:
  bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.14
    revision-id:robertc at robertcollins.net-20080701034954-5r0c28cocphgv6td
    parent: robertc at robertcollins.net-20080701033835-dwbt0f0x3vmf5atr
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Tue 2008-07-01 13:49:54 +1000
    message:
      Review feedback.
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.13
    revision-id:robertc at robertcollins.net-20080701033835-dwbt0f0x3vmf5atr
    parent: robertc at robertcollins.net-20080625012948-aclmfg49kaf8zdv8
    parent: pqm at pqm.ubuntu.com-20080630055535-42tx43kb228k4p94
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Tue 2008-07-01 13:38:35 +1000
    message:
      Merge bzr.dev, fixing minor skew.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
      bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/decorators.py           decorators.py-20060112082512-6bfc2d882df1698d
      bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
      bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
      bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
      bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
      bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
      bzrlib/smart/server.py         server.py-20061110062051-chzu10y32vx8gvur-1
      bzrlib/store/__init__.py       store.py-20050309040759-164dc5173d6406c2
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
      bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
      bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
      bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
      bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
      bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
      bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
      bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
      bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
      bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
      bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
      bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
      bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
      bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
      bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
      bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
      bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
      bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
      bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
      bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
      bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
      bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
      doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.12
    revision-id:robertc at robertcollins.net-20080625012948-aclmfg49kaf8zdv8
    parent: robertc at robertcollins.net-20080625004056-22wn6kasogkq9erq
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Wed 2008-06-25 11:29:48 +1000
    message:
      Stacked make_mpdiffs.
    modified:
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.11
    revision-id:robertc at robertcollins.net-20080625004056-22wn6kasogkq9erq
    parent: robertc at robertcollins.net-20080624120313-hyh4pr14fxzkpbs2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Wed 2008-06-25 10:40:56 +1000
    message:
      Stacked add_mpdiffs.
    modified:
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.10
    revision-id:robertc at robertcollins.net-20080624120313-hyh4pr14fxzkpbs2
    parent: robertc at robertcollins.net-20080623044500-szw4ohqv0lxy44yk
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Tue 2008-06-24 22:03:13 +1000
    message:
      Stacked insert_record_stream.
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.9
    revision-id:robertc at robertcollins.net-20080623044500-szw4ohqv0lxy44yk
    parent: robertc at robertcollins.net-20080623023518-1zae3rsj8h0npnt1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Mon 2008-06-23 14:45:00 +1000
    message:
      define behaviour for add_lines with stacked storage.
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.8
    revision-id:robertc at robertcollins.net-20080623023518-1zae3rsj8h0npnt1
    parent: robertc at robertcollins.net-20080623011320-c5952pwuvi9m6hpp
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Mon 2008-06-23 12:35:18 +1000
    message:
      Stacking and knits don't play nice for annotation yet.
    modified:
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.7
    revision-id:robertc at robertcollins.net-20080623011320-c5952pwuvi9m6hpp
    parent: robertc at robertcollins.net-20080623001926-8vos9qr0xgbm74wu
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Mon 2008-06-23 11:13:20 +1000
    message:
      get_record_stream for fulltexts working (but note extreme memory use!).
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.6
    revision-id:robertc at robertcollins.net-20080623001926-8vos9qr0xgbm74wu
    parent: robertc at robertcollins.net-20080619215406-rmavu3lj4q2d6ryf
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Mon 2008-06-23 10:19:26 +1000
    message:
      get_record_stream stacking for delta access.
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.5
    revision-id:robertc at robertcollins.net-20080619215406-rmavu3lj4q2d6ryf
    parent: robertc at robertcollins.net-20080619132744-zsz5c5cpv6sovwoy
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Fri 2008-06-20 07:54:06 +1000
    message:
      Iter_lines_added_or_present_in_keys stacks.
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.4
    revision-id:robertc at robertcollins.net-20080619132744-zsz5c5cpv6sovwoy
    parent: robertc at robertcollins.net-20080619131424-gbltev5ud5u82gbt
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Thu 2008-06-19 23:27:44 +1000
    message:
      Vf.keys() stacking support.
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.3
    revision-id:robertc at robertcollins.net-20080619131424-gbltev5ud5u82gbt
    parent: robertc at robertcollins.net-20080619064333-apziisq1g280m70v
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Thu 2008-06-19 23:14:24 +1000
    message:
      VF.get_sha1s needed changing to be stackable.
    modified:
      bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
      bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
      bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.2
    revision-id:robertc at robertcollins.net-20080619064333-apziisq1g280m70v
    parent: robertc at robertcollins.net-20080619045351-wjknb9el37ravhjj
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Thu 2008-06-19 16:43:33 +1000
    message:
      stacked get_parent_map.
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3350.3.19.1.1.1.1.1.6.1.1
    revision-id:robertc at robertcollins.net-20080619045351-wjknb9el37ravhjj
    parent: robertc at robertcollins.net-20080612032525-hp52uf3wa7546c4u
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: stacking-knits
    timestamp: Thu 2008-06-19 14:53:51 +1000
    message:
      KnitVersionedFiles.add_fallback_versioned_files exists.
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b

Diff too large for email (1092 lines, the limit is 1000).



More information about the bazaar-commits mailing list