← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patiencediff.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
 
18
from __future__ import absolute_import
18
19
 
19
20
from bzrlib.lazy_import import lazy_import
20
21
lazy_import(globals(), """
73
74
     four
74
75
    """
75
76
    if sequencematcher is None:
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)