~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/groupcompress.py

  • Committer: Aaron Bentley
  • Date: 2009-06-23 21:00:55 UTC
  • mto: This revision was merged to the branch mainline in revision 4490.
  • Revision ID: aaron@aaronbentley.com-20090623210055-6egxoqh7sp77vx7g
Skip stream records that are already present.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1413
1413
        # XXX: TODO: remove this, it is just for safety checking for now
1414
1414
        inserted_keys = set()
1415
1415
        for record in stream:
 
1416
            if len(list(self._index._get_entries([record.key]))) > 0:
 
1417
                continue
1416
1418
            # Raise an error when a record is missing.
1417
1419
            if record.storage_kind == 'absent':
1418
1420
                raise errors.RevisionNotPresent(record.key, self)