mercurial-scm/hg-stable: mercurial/mdiff.py annotate

annotate mercurial/mdiff.py @ 2248:b914f0557832

fix diffs containing embedded "\r". add test to make sure fix stays fixed.

author	Vadim Gelfer <vadim.gelfer@gmail.com>
date	Wed, 10 May 2006 10:31:54 -0700
parents	441ea218414e
children	35fb62a3a673

rev	line source
239 75840796e8e2 mdiff.py: kill #! line, add copyright notice mpm@selenic.com parents: 184 diff changeset	1 # mdiff.py - diff and patch routines for mercurial
75840796e8e2 mdiff.py: kill #! line, add copyright notice mpm@selenic.com parents: 184 diff changeset	2 #
75840796e8e2 mdiff.py: kill #! line, add copyright notice mpm@selenic.com parents: 184 diff changeset	3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
75840796e8e2 mdiff.py: kill #! line, add copyright notice mpm@selenic.com parents: 184 diff changeset	4 #
75840796e8e2 mdiff.py: kill #! line, add copyright notice mpm@selenic.com parents: 184 diff changeset	5 # This software may be used and distributed according to the terms
75840796e8e2 mdiff.py: kill #! line, add copyright notice mpm@selenic.com parents: 184 diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
75840796e8e2 mdiff.py: kill #! line, add copyright notice mpm@selenic.com parents: 184 diff changeset	7
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	8 from demandload import demandload
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	9 import struct, bdiff, util, mpatch
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	10 demandload(globals(), "re")
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	11
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	12
2248 b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	13 def splitnewlines(text, keepends=False):
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	14 '''like str.splitlines, but only split on newlines.'''
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	15 i = 0
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	16 lines = []
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	17 while True:
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	18 n = text.find('\n', i)
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	19 if n == -1:
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	20 last = text[i:]
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	21 if last:
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	22 lines.append(last)
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	23 return lines
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	24 lines.append(text[i:keepends and n+1 or n])
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	25 i = n + 1
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	26
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	27 def unidiff(a, ad, b, bd, fn, r=None, text=False,
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	28 showfunc=False, ignorews=False):
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 361 diff changeset	29
35 9197c26a414b unidiff: punt on comparing empty files mpm@selenic.com parents: 0 diff changeset	30 if not a and not b: return ""
1379 8ee7ce877be2 Clean up mdiff imports Matt Mackall <mpm@selenic.com> parents: 1378 diff changeset	31 epoch = util.datestr((0, 0))
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	32
1379 8ee7ce877be2 Clean up mdiff imports Matt Mackall <mpm@selenic.com> parents: 1378 diff changeset	33 if not text and (util.binary(a) or util.binary(b)):
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 582 diff changeset	34 l = ['Binary file %s has changed\n' % fn]
1723 fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	35 elif not a:
2248 b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	36 b = splitnewlines(b, keepends=True)
1723 fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	37 if a is None:
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	38 l1 = "--- %s\t%s\n" % ("/dev/null", epoch)
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	39 else:
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	40 l1 = "--- %s\t%s\n" % ("a/" + fn, ad)
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	41 l2 = "+++ %s\t%s\n" % ("b/" + fn, bd)
4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	42 l3 = "@@ -0,0 +1,%d @@\n" % len(b)
4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	43 l = [l1, l2, l3] + ["+" + e for e in b]
1723 fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	44 elif not b:
2248 b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	45 a = splitnewlines(a, keepends=True)
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	46 l1 = "--- %s\t%s\n" % ("a/" + fn, ad)
1723 fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	47 if b is None:
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	48 l2 = "+++ %s\t%s\n" % ("/dev/null", epoch)
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	49 else:
fde8fb2cbede Fix diff against an empty file (issue124) and add a test for this. Thomas Arendsen Hein <thomas@intevation.de> parents: 1637 diff changeset	50 l2 = "+++ %s\t%s\n" % ("b/" + fn, bd)
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	51 l3 = "@@ -1,%d +0,0 @@\n" % len(a)
4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	52 l = [l1, l2, l3] + ["-" + e for e in a]
4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 249 diff changeset	53 else:
2248 b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	54 al = splitnewlines(a, keepends=True)
b914f0557832 fix diffs containing embedded "\r". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2078 diff changeset	55 bl = splitnewlines(b, keepends=True)
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	56 l = list(bunidiff(a, b, al, bl, "a/" + fn, "b/" + fn,
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	57 showfunc=showfunc, ignorews=ignorews))
278 777e388c06d6 unidiff: handle empty diffs more gracefully mpm@selenic.com parents: 272 diff changeset	58 if not l: return ""
272 467cea2bf2d8 diff: use tab to separate date from filename mpm@selenic.com parents: 264 diff changeset	59 # difflib uses a space, rather than a tab
1540 8ca9f5b17257 minor optimization: save some string trash twaldmann@thinkmo.de parents: 1452 diff changeset	60 l[0] = "%s\t%s\n" % (l[0][:-2], ad)
8ca9f5b17257 minor optimization: save some string trash twaldmann@thinkmo.de parents: 1452 diff changeset	61 l[1] = "%s\t%s\n" % (l[1][:-2], bd)
170 e6c621a825f2 hg diff: fix missing final newline bug mpm@selenic.com parents: 127 diff changeset	62
e6c621a825f2 hg diff: fix missing final newline bug mpm@selenic.com parents: 127 diff changeset	63 for ln in xrange(len(l)):
e6c621a825f2 hg diff: fix missing final newline bug mpm@selenic.com parents: 127 diff changeset	64 if l[ln][-1] != '\n':
e6c621a825f2 hg diff: fix missing final newline bug mpm@selenic.com parents: 127 diff changeset	65 l[ln] += "\n\ No newline at end of file\n"
e6c621a825f2 hg diff: fix missing final newline bug mpm@selenic.com parents: 127 diff changeset	66
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 361 diff changeset	67 if r:
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 361 diff changeset	68 l.insert(0, "diff %s %s\n" %
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 361 diff changeset	69 (' '.join(["-r %s" % rev for rev in r]), fn))
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 361 diff changeset	70
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	71 return "".join(l)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	72
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	73 # somewhat self contained replacement for difflib.unified_diff
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	74 # t1 and t2 are the text to be diffed
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	75 # l1 and l2 are the text broken up into lines
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	76 # header1 and header2 are the filenames for the diff output
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	77 # context is the number of context lines
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	78 # showfunc enables diff -p output
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	79 # ignorews ignores all whitespace changes in the diff
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	80 def bunidiff(t1, t2, l1, l2, header1, header2, context=3, showfunc=False,
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	81 ignorews=False):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	82 def contextend(l, len):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	83 ret = l + context
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	84 if ret > len:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	85 ret = len
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	86 return ret
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	87
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	88 def contextstart(l):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	89 ret = l - context
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	90 if ret < 0:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	91 return 0
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	92 return ret
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	93
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	94 def yieldhunk(hunk, header):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	95 if header:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	96 for x in header:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	97 yield x
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	98 (astart, a2, bstart, b2, delta) = hunk
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	99 aend = contextend(a2, len(l1))
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	100 alen = aend - astart
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	101 blen = b2 - bstart + aend - a2
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	102
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	103 func = ""
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	104 if showfunc:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	105 # walk backwards from the start of the context
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	106 # to find a line starting with an alphanumeric char.
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	107 for x in xrange(astart, -1, -1):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	108 t = l1[x].rstrip()
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	109 if funcre.match(t):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	110 func = ' ' + t[:40]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	111 break
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	112
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	113 yield "@@ -%d,%d +%d,%d @@%s\n" % (astart + 1, alen,
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	114 bstart + 1, blen, func)
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	115 for x in delta:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	116 yield x
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	117 for x in xrange(a2, aend):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	118 yield ' ' + l1[x]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	119
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	120 header = [ "--- %s\t\n" % header1, "+++ %s\t\n" % header2 ]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	121
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	122 if showfunc:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	123 funcre = re.compile('\w')
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	124 if ignorews:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	125 wsre = re.compile('[ \t]')
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	126
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	127 # bdiff.blocks gives us the matching sequences in the files. The loop
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	128 # below finds the spaces between those matching sequences and translates
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	129 # them into diff output.
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	130 #
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	131 diff = bdiff.blocks(t1, t2)
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	132 hunk = None
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	133 for i in xrange(len(diff)):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	134 # The first match is special.
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	135 # we've either found a match starting at line 0 or a match later
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	136 # in the file. If it starts later, old and new below will both be
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	137 # empty and we'll continue to the next match.
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	138 if i > 0:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	139 s = diff[i-1]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	140 else:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	141 s = [0, 0, 0, 0]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	142 delta = []
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	143 s1 = diff[i]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	144 a1 = s[1]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	145 a2 = s1[0]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	146 b1 = s[3]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	147 b2 = s1[2]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	148
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	149 old = l1[a1:a2]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	150 new = l2[b1:b2]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	151
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	152 # bdiff sometimes gives huge matches past eof, this check eats them,
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	153 # and deals with the special first match case described above
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	154 if not old and not new:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	155 continue
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	156
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	157 if ignorews:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	158 wsold = wsre.sub('', "".join(old))
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	159 wsnew = wsre.sub('', "".join(new))
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	160 if wsold == wsnew:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	161 continue
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	162
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	163 astart = contextstart(a1)
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	164 bstart = contextstart(b1)
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	165 prev = None
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	166 if hunk:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	167 # join with the previous hunk if it falls inside the context
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	168 if astart < hunk[1] + context + 1:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	169 prev = hunk
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	170 astart = hunk[1]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	171 bstart = hunk[3]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	172 else:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	173 for x in yieldhunk(hunk, header):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	174 yield x
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	175 # we only want to yield the header if the files differ, and
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	176 # we only want to yield it once.
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	177 header = None
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	178 if prev:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	179 # we've joined the previous hunk, record the new ending points.
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	180 hunk[1] = a2
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	181 hunk[3] = b2
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	182 delta = hunk[4]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	183 else:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	184 # create a new hunk
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	185 hunk = [ astart, a2, bstart, b2, delta ]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	186
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	187 delta[len(delta):] = [ ' ' + x for x in l1[astart:a1] ]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	188 delta[len(delta):] = [ '-' + x for x in old ]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	189 delta[len(delta):] = [ '+' + x for x in new ]
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	190
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	191 if hunk:
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	192 for x in yieldhunk(hunk, header):
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	193 yield x
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1540 diff changeset	194
120 bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	195 def patchtext(bin):
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	196 pos = 0
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	197 t = []
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	198 while pos < len(bin):
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	199 p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12])
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	200 pos += 12
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	201 t.append(bin[pos:pos + l])
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	202 pos += l
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	203 return "".join(t)
bae6f0328f63 Add a function to return the new text from a binary diff mpm@selenic.com parents: 75 diff changeset	204
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	205 def patch(a, bin):
1379 8ee7ce877be2 Clean up mdiff imports Matt Mackall <mpm@selenic.com> parents: 1378 diff changeset	206 return mpatch.patches(a, [bin])
432 3b9e3d3d2810 Start using bdiff for generating deltas mpm@selenic.com parents: 396 diff changeset	207
1379 8ee7ce877be2 Clean up mdiff imports Matt Mackall <mpm@selenic.com> parents: 1378 diff changeset	208 patches = mpatch.patches
2078 441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 1723 diff changeset	209 patchedsize = mpatch.patchedsize
432 3b9e3d3d2810 Start using bdiff for generating deltas mpm@selenic.com parents: 396 diff changeset	210 textdiff = bdiff.bdiff

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/mdiff.py @ 2248:b914f0557832