~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Robert Collins
  • Date: 2007-10-22 19:53:26 UTC
  • mto: This revision was merged to the branch mainline in revision 2927.
  • Revision ID: robertc@robertcollins.net-20071022195326-f3cae7e3e36spmno
Review feedback.

Show diffs side-by-side

added added

removed removed

Lines of Context:
139
139
        return list(self.annotate_iter())
140
140
 
141
141
    def apply_delta(self, delta, new_version_id):
142
 
        """Apply delta to the this object to become new_version_id."""
 
142
        """Apply delta to this object to become new_version_id."""
143
143
        raise NotImplementedError(self.apply_delta)
144
144
 
145
145
    def line_delta_iter(self, new_lines):
194
194
        return iter(self._lines)
195
195
 
196
196
    def apply_delta(self, delta, new_version_id):
197
 
        """Apply delta to the this object to become new_version_id."""
 
197
        """Apply delta to this object to become new_version_id."""
198
198
        offset = 0
199
199
        lines = self._lines
200
200
        for start, end, count, delta_lines in delta:
238
238
            yield self._version_id, line
239
239
 
240
240
    def apply_delta(self, delta, new_version_id):
241
 
        """Apply delta to the this object to become new_version_id."""
 
241
        """Apply delta to this object to become new_version_id."""
242
242
        offset = 0
243
243
        lines = self._lines
244
244
        for start, end, count, delta_lines in delta: