← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patiencediff.py

  • Committer: Vincent Ladeuil
  • Date: 2008-09-11 19:36:38 UTC
  • mfrom: (3703 +trunk)
  • mto: (3705.1.1 trunk2)
  • mto: This revision was merged to the branch mainline in revision 3708.
  • Revision ID: v.ladeuil+lp@free.fr-20080911193638-wtjyc1kcmacc6t1f
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patiencediff.py
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
 
19
19
from bzrlib.lazy_import import lazy_import
73
73
     four
74
74
    """
75
75
    if sequencematcher is None:
 
76
        import difflib
76
77
        sequencematcher = difflib.SequenceMatcher
77
78
 
78
 
    if fromfiledate:
79
 
        fromfiledate = '\t' + str(fromfiledate)
80
 
    if tofiledate:
81
 
        tofiledate = '\t' + str(tofiledate)
82
 
 
83
79
    started = False
84
80
    for group in sequencematcher(None,a,b).get_grouped_opcodes(n):
85
81
        if not started:
86
 
            yield '--- %s%s%s' % (fromfile, fromfiledate, lineterm)
87
 
            yield '+++ %s%s%s' % (tofile, tofiledate, lineterm)
 
82
            yield '--- %s %s%s' % (fromfile, fromfiledate, lineterm)
 
83
            yield '+++ %s %s%s' % (tofile, tofiledate, lineterm)
88
84
            started = True
89
85
        i1, i2, j1, j2 = group[0][1], group[-1][2], group[0][3], group[-1][4]
90
86
        yield "@@ -%d,%d +%d,%d @@%s" % (i1+1, i2-i1, j1+1, j2-j1, lineterm)