mdiff.py
91 lines
| 2.4 KiB
| text/x-python
|
PythonLexer
/ mercurial / mdiff.py
|
r239 | # mdiff.py - diff and patch routines for mercurial | ||
# | ||||
# Copyright 2005 Matt Mackall <mpm@selenic.com> | ||||
# | ||||
# This software may be used and distributed according to the terms | ||||
# of the GNU General Public License, incorporated herein by reference. | ||||
|
r249 | import difflib, struct | ||
|
r127 | from mercurial.mpatch import * | ||
|
r0 | |||
|
r64 | def unidiff(a, ad, b, bd, fn): | ||
|
r35 | if not a and not b: return "" | ||
|
r264 | |||
if a == None: | ||||
b = b.splitlines(1) | ||||
l1 = "--- %s\t%s\n" % ("/dev/null", ad) | ||||
l2 = "+++ %s\t%s\n" % ("b/" + fn, bd) | ||||
l3 = "@@ -0,0 +1,%d @@\n" % len(b) | ||||
l = [l1, l2, l3] + ["+" + e for e in b] | ||||
elif b == None: | ||||
a = a.splitlines(1) | ||||
l1 = "--- %s\t%s\n" % ("a/" + fn, ad) | ||||
l2 = "+++ %s\t%s\n" % ("/dev/null", bd) | ||||
l3 = "@@ -1,%d +0,0 @@\n" % len(a) | ||||
l = [l1, l2, l3] + ["-" + e for e in a] | ||||
else: | ||||
a = a.splitlines(1) | ||||
b = b.splitlines(1) | ||||
l = list(difflib.unified_diff(a, b, "a/" + fn, "b/" + fn, ad, bd)) | ||||
|
r170 | |||
for ln in xrange(len(l)): | ||||
if l[ln][-1] != '\n': | ||||
l[ln] += "\n\ No newline at end of file\n" | ||||
|
r0 | return "".join(l) | ||
def textdiff(a, b): | ||||
return diff(a.splitlines(1), b.splitlines(1)) | ||||
def sortdiff(a, b): | ||||
la = lb = 0 | ||||
|
r184 | lena = len(a) | ||
lenb = len(b) | ||||
|
r0 | while 1: | ||
|
r184 | am, bm, = la, lb | ||
while lb < lenb and la < len and a[la] == b[lb] : | ||||
|
r0 | la += 1 | ||
lb += 1 | ||||
|
r184 | if la>am: yield (am, bm, la-am) | ||
while lb < lenb and b[lb] < a[la]: lb += 1 | ||||
if lb>=lenb: break | ||||
while la < lena and b[lb] > a[la]: la += 1 | ||||
if la>=lena: break | ||||
yield (lena, lenb, 0) | ||||
|
r0 | |||
def diff(a, b, sorted=0): | ||||
|
r184 | if not a: | ||
s = "".join(b) | ||||
return s and (struct.pack(">lll", 0, 0, len(s)) + s) | ||||
|
r0 | bin = [] | ||
p = [0] | ||||
for i in a: p.append(p[-1] + len(i)) | ||||
if sorted: | ||||
d = sortdiff(a, b) | ||||
else: | ||||
|
r184 | d = difflib.SequenceMatcher(None, a, b).get_matching_blocks() | ||
la = 0 | ||||
lb = 0 | ||||
for am, bm, size in d: | ||||
s = "".join(b[lb:bm]) | ||||
if am > la or s: | ||||
bin.append(struct.pack(">lll", p[la], p[am], len(s)) + s) | ||||
la = am + size | ||||
lb = bm + size | ||||
|
r0 | return "".join(bin) | ||
|
r120 | def patchtext(bin): | ||
pos = 0 | ||||
t = [] | ||||
while pos < len(bin): | ||||
p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12]) | ||||
pos += 12 | ||||
t.append(bin[pos:pos + l]) | ||||
pos += l | ||||
return "".join(t) | ||||
|
r0 | def patch(a, bin): | ||
|
r72 | return patches(a, [bin]) | ||