# HG changeset patch # User mpm@selenic.com # Date 1119468181 28800 # Node ID 3b9e3d3d2810e4ab7394cab0be3ce25aa72ef5e5 # Parent dfc44f3f587c5b26b59f2d01f6bfd0b97a56d31d Start using bdiff for generating deltas -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Start using bdiff for generating deltas manifest hash: bf6ed7d17d96810b7f40b50811b104b568c64b4b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCubqVywK+sNU5EO8RAor6AKCm8Zqg0DIhLzaMPp5/GKPKk/GjKwCfbCe+ /CBmpvcTxSJofY9RE08cCVY= =2yu2 -----END PGP SIGNATURE----- diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py --- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -5,8 +5,8 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. -import difflib, struct -from mercurial.mpatch import * +import difflib, struct, bdiff +from mpatch import * def unidiff(a, ad, b, bd, fn, r=None): @@ -43,9 +43,6 @@ def unidiff(a, ad, b, bd, fn, r=None): return "".join(l) -def textdiff(a, b): - return diff(a.splitlines(1), b.splitlines(1)) - def sortdiff(a, b): la = lb = 0 lena = len(a) @@ -118,3 +115,7 @@ def patchtext(bin): def patch(a, bin): return patches(a, [bin]) + +textdiff = bdiff.bdiff + +