Mercurial > hg > pyhgsh

changeset 432:3b9e3d3d2810

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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-----
author mpm@selenic.com
date Wed, 22 Jun 2005 11:23:01 -0800
parents dfc44f3f587c
children 79c694462294
files mercurial/mdiff.py
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/mdiff.py	Wed Jun 22 11:21:04 2005 -0800
+++ b/mercurial/mdiff.py	Wed Jun 22 11:23:01 2005 -0800
@@ -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 @@
 
     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 patch(a, bin):
     return patches(a, [bin])
+
+textdiff = bdiff.bdiff
+
+