Rev 3238: Fix failing tests post-VersionedFiles merge. in http://people.ubuntu.com/~robertc/baz2.0/shallow-branch

[Robert Collins]

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

------------------------------------------------------------
revno: 3238
revision-id: robertc at robertcollins.net-20080612041526-8hvqsqeeeh2ndpcv
parent: robertc at robertcollins.net-20080612023152-sh5kl9qttrezaz8o
parent: robertc at robertcollins.net-20080612032525-hp52uf3wa7546c4u
committer: Robert Collins <robertc at robertcollins.net>
branch nick: Development1
timestamp: Thu 2008-06-12 14:15:26 +1000
message:
  Fix failing tests post-VersionedFiles merge.
modified:
  bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3221.324.6
    revision-id: robertc at robertcollins.net-20080612032525-hp52uf3wa7546c4u
    parent: robertc at robertcollins.net-20080611072200-04p1qce41wbvipmf
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: VersionedFiles.add_api
    timestamp: Thu 2008-06-12 13:25:25 +1000
    message:
      Fix test_plan_file_merge
    modified:
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
=== modified file 'bzrlib/tests/per_repository_reference/test_add_inventory.py'
--- a/bzrlib/tests/per_repository_reference/test_add_inventory.py	2008-06-06 08:20:03 +0000
+++ b/bzrlib/tests/per_repository_reference/test_add_inventory.py	2008-06-12 04:15:26 +0000
@@ -46,4 +46,4 @@
             repo.unlock()
         inv2 = repo.get_inventory(revid)
         self.assertEqual(inv._byid, inv2._byid)
-        self.assertRaises(errors.RevisionNotPresent, base.get_inventory, revid)
+        self.assertRaises(errors.NoSuchRevision, base.get_inventory, revid)

=== modified file 'bzrlib/versionedfile.py'
--- a/bzrlib/versionedfile.py	2008-06-11 07:22:00 +0000
+++ b/bzrlib/versionedfile.py	2008-06-12 03:25:25 +0000
@@ -1197,8 +1197,14 @@
         # We create a new provider because a fallback may have been added.
         # If we make fallbacks private we can update a stack list and avoid
         # object creation thrashing.
+        keys = set(keys)
+        result = {}
+        if revision.NULL_REVISION in keys:
+            keys.remove(revision.NULL_REVISION)
+            result[revision.NULL_REVISION] = ()
         self._providers = self._providers[:1] + self.fallback_versionedfiles
-        result = _StackedParentsProvider(self._providers).get_parent_map(keys)
+        result.update(
+            _StackedParentsProvider(self._providers).get_parent_map(keys))
         for key, parents in result.iteritems():
             if parents == ():
                 result[key] = (revision.NULL_REVISION,)