← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
70
70
 
71
71
from copy import copy
72
72
from cStringIO import StringIO
73
 
from difflib import SequenceMatcher
74
73
import os
75
74
import sha
76
75
import time
84
83
        )
85
84
import bzrlib.errors as errors
86
85
from bzrlib.osutils import sha_strings
87
 
from bzrlib.patiencediff import SequenceMatcher, unified_diff
 
86
from bzrlib.patiencediff import PatienceSequenceMatcher, unified_diff
88
87
from bzrlib.symbol_versioning import *
89
88
from bzrlib.tsort import topo_sort
90
89
from bzrlib.versionedfile import VersionedFile, InterVersionedFile
192
191
        self._name_map = {}
193
192
        self._weave_name = weave_name
194
193
        if matcher is None:
195
 
            self._matcher = SequenceMatcher
 
194
            self._matcher = PatienceSequenceMatcher
196
195
        else:
197
196
            self._matcher = matcher
198
197