Rev 3239: Merge stackable knits. in http://people.ubuntu.com/~robertc/baz2.0/shallow-branch

Robert Collins robertc at robertcollins.net
Wed Jun 25 03:39:55 BST 2008


At http://people.ubuntu.com/~robertc/baz2.0/shallow-branch

------------------------------------------------------------
revno: 3239
revision-id: robertc at robertcollins.net-20080625023945-nmu1d5jbt2i5bakk
parent: robertc at robertcollins.net-20080612041526-8hvqsqeeeh2ndpcv
parent: robertc at robertcollins.net-20080625012948-aclmfg49kaf8zdv8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Development1
timestamp: Wed 2008-06-25 12:39:45 +1000
message:
  Merge stackable knits.
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: 3221.324.18
    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: 3221.324.17
    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: 3221.324.16
    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: 3221.324.15
    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: 3221.324.14
    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: 3221.324.13
    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: 3221.324.12
    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: 3221.324.11
    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: 3221.324.10
    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: 3221.324.9
    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: 3221.324.8
    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: 3221.324.7
    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 (1094 lines, the limit is 1000).



More information about the bazaar-commits mailing list