~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-17 07:33:12 UTC
  • mfrom: (3530.3.3 btree-graphindex)
  • Revision ID: pqm@pqm.ubuntu.com-20080717073312-reglpowwyo671081
(robertc) Intern GraphIndex strings and handle frozenset inputs to
        make_mpdiffs in the case of errors. (Robert Collins, Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
893
893
                knit_keys.update(parent_keys)
894
894
        missing_keys = keys - set(parent_map)
895
895
        if missing_keys:
896
 
            raise errors.RevisionNotPresent(missing_keys.pop(), self)
 
896
            raise errors.RevisionNotPresent(list(missing_keys)[0], self)
897
897
        # We need to filter out ghosts, because we can't diff against them.
898
898
        maybe_ghosts = knit_keys - keys
899
899
        ghosts = maybe_ghosts - set(self.get_parent_map(maybe_ghosts))