Rev 3789: Support Inventory.__getitem__ more consistently. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

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

------------------------------------------------------------
revno: 3789
revision-id: robertc at robertcollins.net-20081114083026-rsylizy0ddsxdlu6
parent: robertc at robertcollins.net-20081114082151-0g1m7dkmcs1oowqj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2008-11-14 19:30:26 +1100
message:
  Support Inventory.__getitem__ more consistently.
modified:
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py	2008-11-14 08:21:51 +0000
+++ b/bzrlib/inventory.py	2008-11-14 08:30:26 +0000
@@ -1545,7 +1545,8 @@
             return self._bytes_to_entry(
                 self.id_to_entry.iteritems([(file_id,)]).next()[1])
         except StopIteration:
-            raise KeyError(file_id)
+            # really we're passing an inventory, not a tree...
+            raise errors.NoSuchId(self, file_id)
 
     def has_id(self, file_id):
         # Perhaps have an explicit 'contains' method on CHKMap ?

=== modified file 'bzrlib/tests/test_inv.py'
--- a/bzrlib/tests/test_inv.py	2008-11-14 02:13:12 +0000
+++ b/bzrlib/tests/test_inv.py	2008-11-14 08:30:26 +0000
@@ -317,6 +317,7 @@
         self.assertEqual("ffff", file_entry.text_sha1)
         self.assertEqual(1, file_entry.text_size)
         self.assertEqual(True, file_entry.executable)
+        self.assertRaises(errors.NoSuchId, new_inv.__getitem__, 'missing')
 
     def test_has_id_true(self):
         inv = Inventory()