Rev 2982: Tweaks from John. in http://people.ubuntu.com/~robertc/baz2.0/commit.merge-speed

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/commit.merge-speed

------------------------------------------------------------
revno: 2982
revision-id:robertc at robertcollins.net-20071114181956-osz2q0sa6v2wpb1b
parent: robertc at robertcollins.net-20071112225758-co7hf9fpdonhkzs8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit.merge-speed
timestamp: Thu 2007-11-15 05:19:56 +1100
message:
  Tweaks from John.
modified:
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
=== modified file 'bzrlib/index.py'
--- a/bzrlib/index.py	2007-11-12 22:57:58 +0000
+++ b/bzrlib/index.py	2007-11-14 18:19:56 +0000
@@ -1009,15 +1009,12 @@
              * (parent_key, parent_key...) otherwise.
         """
         search_keys = set(revision_ids)
-        if NULL_REVISION in search_keys:
-            search_keys.remove(NULL_REVISION)
+        search_keys.discard(NULL_REVISION)
         found_parents = {NULL_REVISION:[]}
         for index, key, value, refs in self.iter_entries(search_keys):
             parents = refs[0]
             if not parents:
                 parents = (NULL_REVISION,)
-            else:
-                parents = refs[0]
             found_parents[key] = parents
         result = []
         for key in revision_ids: