mdiff.py
62 lines
| 1.8 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. | ||||
|
r1379 | import difflib, struct, bdiff, util, mpatch | ||
|
r0 | |||
|
r1015 | def unidiff(a, ad, b, bd, fn, r=None, text=False): | ||
|
r396 | |||
|
r35 | if not a and not b: return "" | ||
|
r1379 | epoch = util.datestr((0, 0)) | ||
|
r264 | |||
|
r1379 | if not text and (util.binary(a) or util.binary(b)): | ||
|
r1015 | l = ['Binary file %s has changed\n' % fn] | ||
elif a == None: | ||||
|
r264 | b = b.splitlines(1) | ||
|
r1378 | l1 = "--- %s\t%s\n" % ("/dev/null", epoch) | ||
|
r264 | 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) | ||||
|
r1378 | l2 = "+++ %s\t%s\n" % ("/dev/null", epoch) | ||
|
r264 | 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) | ||||
|
r272 | l = list(difflib.unified_diff(a, b, "a/" + fn, "b/" + fn)) | ||
|
r278 | if not l: return "" | ||
|
r272 | # difflib uses a space, rather than a tab | ||
|
r1540 | l[0] = "%s\t%s\n" % (l[0][:-2], ad) | ||
l[1] = "%s\t%s\n" % (l[1][:-2], bd) | ||||
|
r170 | |||
for ln in xrange(len(l)): | ||||
if l[ln][-1] != '\n': | ||||
l[ln] += "\n\ No newline at end of file\n" | ||||
|
r396 | if r: | ||
l.insert(0, "diff %s %s\n" % | ||||
(' '.join(["-r %s" % rev for rev in r]), fn)) | ||||
|
r0 | return "".join(l) | ||
|
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): | ||
|
r1379 | return mpatch.patches(a, [bin]) | ||
|
r432 | |||
|
r1379 | patches = mpatch.patches | ||
|
r432 | textdiff = bdiff.bdiff | ||