← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

Late bind to PatienceSequenceMatcher to allow plugin to override.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
83
83
        )
84
84
import bzrlib.errors as errors
85
85
from bzrlib.osutils import sha_strings
86
 
from bzrlib.patiencediff import PatienceSequenceMatcher, unified_diff
 
86
import bzrlib.patiencediff
87
87
from bzrlib.symbol_versioning import *
88
88
from bzrlib.tsort import topo_sort
89
89
from bzrlib.versionedfile import VersionedFile, InterVersionedFile
191
191
        self._name_map = {}
192
192
        self._weave_name = weave_name
193
193
        if matcher is None:
194
 
            self._matcher = PatienceSequenceMatcher
 
194
            self._matcher = bzrlib.patiencediff.PatienceSequenceMatcher
195
195
        else:
196
196
            self._matcher = matcher
197
197
 
1365
1365
        v1, v2 = map(int, argv[3:5])
1366
1366
        lines1 = w.get(v1)
1367
1367
        lines2 = w.get(v2)
1368
 
        diff_gen = unified_diff(lines1, lines2,
 
1368
        diff_gen = bzrlib.patiencediff.unified_diff(lines1, lines2,
1369
1369
                                '%s version %d' % (fn, v1),
1370
1370
                                '%s version %d' % (fn, v2))
1371
1371
        sys.stdout.writelines(diff_gen)