← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patiencediff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-01-06 17:15:20 UTC
  • mfrom: (3922.1.5 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090106171520-9pzjoqa7m74hvhht
(Adeodato Simo) Update patience_diff.unified_diff so that it doesn't
        add trailing whitespace when you don't supply datestamps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patiencediff.py
76
76
        import difflib
77
77
        sequencematcher = difflib.SequenceMatcher
78
78
 
 
79
    if fromfiledate:
 
80
        fromfiledate = '\t' + str(fromfiledate)
 
81
    if tofiledate:
 
82
        tofiledate = '\t' + str(tofiledate)
 
83
 
79
84
    started = False
80
85
    for group in sequencematcher(None,a,b).get_grouped_opcodes(n):
81
86
        if not started:
82
 
            yield '--- %s %s%s' % (fromfile, fromfiledate, lineterm)
83
 
            yield '+++ %s %s%s' % (tofile, tofiledate, lineterm)
 
87
            yield '--- %s%s%s' % (fromfile, fromfiledate, lineterm)
 
88
            yield '+++ %s%s%s' % (tofile, tofiledate, lineterm)
84
89
            started = True
85
90
        i1, i2, j1, j2 = group[0][1], group[-1][2], group[0][3], group[-1][4]
86
91
        yield "@@ -%d,%d +%d,%d @@%s" % (i1+1, i2-i1, j1+1, j2-j1, lineterm)