← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge3.py

Late bind to PatienceSequenceMatcher in merge3.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge3.py
20
20
 
21
21
 
22
22
from bzrlib.errors import CantReprocessAndShowBase
23
 
from bzrlib.patiencediff import PatienceSequenceMatcher
 
23
import bzrlib.patiencediff
24
24
from bzrlib.textfile import check_text_lines
25
25
 
26
 
SequenceMatcher = PatienceSequenceMatcher
27
 
 
28
26
 
29
27
def intersect(ra, rb):
30
28
    """Given two ranges return the range where they intersect or None.
296
294
            type, iz, zmatch, ia, amatch, ib, bmatch = region
297
295
            a_region = self.a[ia:amatch]
298
296
            b_region = self.b[ib:bmatch]
299
 
            matches = SequenceMatcher(None, a_region, 
300
 
                                      b_region).get_matching_blocks()
 
297
            matches = bzrlib.patiencediff.PatienceSequenceMatcher(
 
298
                    None, a_region, b_region).get_matching_blocks()
301
299
            next_a = ia
302
300
            next_b = ib
303
301
            for region_ia, region_ib, region_len in matches[:-1]:
329
327
        """
330
328
 
331
329
        ia = ib = 0
332
 
        amatches = SequenceMatcher(None, self.base, self.a).get_matching_blocks()
333
 
        bmatches = SequenceMatcher(None, self.base, self.b).get_matching_blocks()
 
330
        amatches = bzrlib.patiencediff.PatienceSequenceMatcher(
 
331
                None, self.base, self.a).get_matching_blocks()
 
332
        bmatches = bzrlib.patiencediff.PatienceSequenceMatcher(
 
333
                None, self.base, self.b).get_matching_blocks()
334
334
        len_a = len(amatches)
335
335
        len_b = len(bmatches)
336
336
 
386
386
 
387
387
    def find_unconflicted(self):
388
388
        """Return a list of ranges in base that are not conflicted."""
389
 
        am = SequenceMatcher(None, self.base, self.a).get_matching_blocks()
390
 
        bm = SequenceMatcher(None, self.base, self.b).get_matching_blocks()
 
389
        am = bzrlib.patiencediff.PatienceSequenceMatcher(
 
390
                None, self.base, self.a).get_matching_blocks()
 
391
        bm = bzrlib.patiencediff.PatienceSequenceMatcher(
 
392
                None, self.base, self.b).get_matching_blocks()
391
393
 
392
394
        unc = []
393
395