← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patches.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-20 16:16:34 UTC
  • mfrom: (3123.5.18 hardlinks)
  • Revision ID: pqm@pqm.ubuntu.com-20071220161634-2kcjb650o21ydko4
Accelerate build_tree using similar workingtrees (abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patches.py
220
220
            return self.shift_to_mod_lines(pos)
221
221
 
222
222
    def shift_to_mod_lines(self, pos):
 
223
        assert (pos >= self.orig_pos-1 and pos <= self.orig_pos+self.orig_range)
223
224
        position = self.orig_pos-1
224
225
        shift = 0
225
226
        for line in self.lines:
354
355
    last_line = None
355
356
    for line in iter_lines:
356
357
        if line == NO_NL:
357
 
            if not last_line.endswith('\n'):
358
 
                raise AssertionError()
 
358
            assert last_line.endswith('\n')
359
359
            last_line = last_line[:-1]
360
360
            line = None
361
361
        if last_line is not None:
415
415
                if isinstance(hunk_line, ContextLine):
416
416
                    yield orig_line
417
417
                else:
418
 
                    if not isinstance(hunk_line, RemoveLine):
419
 
                        raise AssertionError(hunk_line)
 
418
                    assert isinstance(hunk_line, RemoveLine)
420
419
                line_no += 1
421
420
    if orig_lines is not None:
422
421
        for line in orig_lines: