← 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: 2009-03-18 02:14:31 UTC
  • mfrom: (4158.2.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090318021431-md1n8o3542wwsvai
(mbp) merge back 1.13final to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textmerge.py
1
 
# Copyright (C) 2006, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
#
17
17
# Author: Martin Pool <mbp@canonical.com>
18
18
#         Aaron Bentley <aaron.bentley@utoronto.ca>
19
19
 
20
20
 
21
 
from bzrlib.lazy_import import lazy_import
22
 
lazy_import(globals(), """
23
 
from bzrlib import patiencediff
24
 
""")
 
21
import bzrlib.patiencediff
25
22
 
26
23
 
27
24
class TextMerge(object):
134
131
        """Return structured merge info.
135
132
        See TextMerge docstring.
136
133
        """
137
 
        sm = patiencediff.PatienceSequenceMatcher(
138
 
            None, self.lines_a, self.lines_b)
 
134
        sm = bzrlib.patiencediff.PatienceSequenceMatcher(None, self.lines_a, self.lines_b)
139
135
        pos_a = 0
140
136
        pos_b = 0
141
137
        for ai, bi, l in sm.get_matching_blocks():