← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
17
17
from bzrlib.delta import compare_trees
18
18
from bzrlib.errors import BzrError
19
19
import bzrlib.errors as errors
20
 
from bzrlib.patiencediff import SequenceMatcher, unified_diff
 
20
from bzrlib.patiencediff import PatienceSequenceMatcher, unified_diff
21
21
from bzrlib.symbol_versioning import *
22
22
from bzrlib.textfile import check_text_lines
23
23
from bzrlib.trace import mutter
49
49
        check_text_lines(newlines)
50
50
 
51
51
    if sequence_matcher is None:
52
 
        sequence_matcher = SequenceMatcher
 
52
        sequence_matcher = PatienceSequenceMatcher
53
53
    ud = unified_diff(oldlines, newlines,
54
54
                      fromfile=old_filename+'\t', 
55
55
                      tofile=new_filename+'\t',