##// END OF EJS Templates
Start using bdiff for generating deltas...
mpm@selenic.com -
r432:3b9e3d3d default
parent child Browse files
Show More
@@ -5,8 +5,8 b''
5 # This software may be used and distributed according to the terms
5 # This software may be used and distributed according to the terms
6 # of the GNU General Public License, incorporated herein by reference.
6 # of the GNU General Public License, incorporated herein by reference.
7
7
8 import difflib, struct
8 import difflib, struct, bdiff
9 from mercurial.mpatch import *
9 from mpatch import *
10
10
11 def unidiff(a, ad, b, bd, fn, r=None):
11 def unidiff(a, ad, b, bd, fn, r=None):
12
12
@@ -43,9 +43,6 b' def unidiff(a, ad, b, bd, fn, r=None):'
43
43
44 return "".join(l)
44 return "".join(l)
45
45
46 def textdiff(a, b):
47 return diff(a.splitlines(1), b.splitlines(1))
48
49 def sortdiff(a, b):
46 def sortdiff(a, b):
50 la = lb = 0
47 la = lb = 0
51 lena = len(a)
48 lena = len(a)
@@ -118,3 +115,7 b' def patchtext(bin):'
118
115
119 def patch(a, bin):
116 def patch(a, bin):
120 return patches(a, [bin])
117 return patches(a, [bin])
118
119 textdiff = bdiff.bdiff
120
121
General Comments 0
You need to be logged in to leave comments. Login now