← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textmerge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-05-29 23:15:16 UTC
  • mfrom: (1711.2.25 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060529231516-cad98b5042ea75f3
(jam) Updates to PatienceDiff for performance, and other cleanups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textmerge.py
18
18
#         Aaron Bentley <aaron.bentley@utoronto.ca>
19
19
 
20
20
 
21
 
from bzrlib.patiencediff import SequenceMatcher
 
21
import bzrlib.patiencediff
22
22
 
23
23
 
24
24
class TextMerge(object):
131
131
        """Return structured merge info.  
132
132
        See TextMerge docstring.
133
133
        """
134
 
        sm = SequenceMatcher(None, self.lines_a, self.lines_b)
 
134
        sm = bzrlib.patiencediff.PatienceSequenceMatcher(None, self.lines_a, self.lines_b)
135
135
        pos_a = 0
136
136
        pos_b = 0
137
137
        for ai, bi, l in sm.get_matching_blocks():