← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Andrew Bennetts
  • Date: 2008-10-01 05:40:45 UTC
  • mfrom: (3753 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20081001054045-z50qc0d3p9qsc5im
Merge from bzr.dev; resolve osutils.py conflict by reverting my sha import hackery.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
726
726
            self._factory = KnitPlainFactory()
727
727
        self._fallback_vfs = []
728
728
 
 
729
    def __repr__(self):
 
730
        return "%s(%r, %r)" % (
 
731
            self.__class__.__name__,
 
732
            self._index,
 
733
            self._access)
 
734
 
729
735
    def add_fallback_versioned_files(self, a_versioned_files):
730
736
        """Add a source of texts for texts not present in this knit.
731
737
 
1427
1433
                yield line, key
1428
1434
            keys.difference_update(source_keys)
1429
1435
        if keys:
1430
 
            raise RevisionNotPresent(keys, self.filename)
 
1436
            # XXX: strictly the second parameter is meant to be the file id
 
1437
            # but it's not easily accessible here.
 
1438
            raise RevisionNotPresent(keys, repr(self))
1431
1439
        pb.update('Walking content.', total, total)
1432
1440
 
1433
1441
    def _make_line_delta(self, delta_seq, new_content):