Rev 3775: Merge bb-core. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/repository

------------------------------------------------------------
revno: 3775
revision-id: robertc at robertcollins.net-20081114001623-vfblxa8k3vhg127a
parent: robertc at robertcollins.net-20081114001152-kyi3rh0c0a96f1g1
parent: vila at scythe-20081113031151-2y28vofooyac64d1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2008-11-14 11:16:23 +1100
message:
  Merge bb-core.
modified:
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
    ------------------------------------------------------------
    revno: 3765.1.2
    revision-id: vila at scythe-20081113031151-2y28vofooyac64d1
    parent: vila at scythe-20081113010847-t0wxw93gm70g3f97
    parent: robertc at robertcollins.net-20081113032056-djjm0lykam7okvit
    committer: Vincent Ladeuil <vila at scythe>
    branch nick: brisbane-core
    timestamp: Thu 2008-11-13 13:11:51 +1000
    message:
      merge brisbane-core
    modified:
      bzrlib/chk_map.py              chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
      bzrlib/tests/test_chk_map.py   test_chk_map.py-20081001014447-ue6kkuhofvdecvxa-2
    ------------------------------------------------------------
    revno: 3765.1.1
    revision-id: vila at scythe-20081113010847-t0wxw93gm70g3f97
    parent: robertc at robertcollins.net-20081112091906-dcbbp5hkfopz30je
    committer: Vincent Ladeuil <vila at scythe>
    branch nick: brisbane-core
    timestamp: Thu 2008-11-13 11:08:47 +1000
    message:
      Reduce failing tests from 62 errors/21 failures to 6 errors/3 failures.
      
      * bzrlib/tests/test_pack_repository.py:
      (load_tests): Fix some forgotten occurrences.
      
      * bzrlib/repository.py:
      (_make_inv_delta): Not all inventories provides _byid attributes,
      but thos who do use it in their __iter__ implementation.
      
      * bzrlib/repofmt/pack_repo.py:
      (CHKInventoryRepository._find_file_keys_to_fetch): node.iteritems
      requires the chk map store as parameter.
    modified:
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py	2008-11-14 00:11:52 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2008-11-14 00:16:23 +0000
@@ -2215,7 +2215,7 @@
                     uninteresting_chk_refs.add(node.key())
                     if not isinstance(node, chk_map.InternalNode):
                         # Leaf node: pull out its contents:
-                        for name, bytes in node.iteritems(self):
+                        for name, bytes in node.iteritems(inv_chk_map._store):
                             entry = inv._bytes_to_entry(bytes)
                             if entry.name == '' and not rich_root:
                                 continue

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2008-11-12 09:19:06 +0000
+++ b/bzrlib/repository.py	2008-11-13 01:08:47 +0000
@@ -2142,8 +2142,8 @@
 
 def _make_inv_delta(old, new):
     """Make an inventory delta from two inventories."""
-    old_ids = set(old._byid.iterkeys())
-    new_ids = set(new._byid.iterkeys())
+    old_ids = set(old)
+    new_ids = set(new)
     adds = new_ids - old_ids
     deletes = old_ids - new_ids
     common = old_ids.intersection(new_ids)

=== modified file 'bzrlib/tests/test_pack_repository.py'
--- a/bzrlib/tests/test_pack_repository.py	2008-11-06 23:00:22 +0000
+++ b/bzrlib/tests/test_pack_repository.py	2008-11-13 01:08:47 +0000
@@ -721,12 +721,12 @@
               index_class=BTreeGraphIndex),
          dict(format_name='development3',
               format_string="Bazaar development format 3 "
-                  "(needs bzr.dev from before 1.8)\n",
+                  "(needs bzr.dev from before 1.10)\n",
               format_supports_external_lookups=True,
               index_class=BTreeGraphIndex),
          dict(format_name='development3-subtree',
               format_string="Bazaar development format 3 "
-                  "with subtree support (needs bzr.dev from before 1.8)\n",
+                  "with subtree support (needs bzr.dev from before 1.10)\n",
               format_supports_external_lookups=True,
               index_class=BTreeGraphIndex),
          ]