Mercurial > public > mercurial-scm > hg
diff mercurial/mdiff.py @ 515:03f27b1381f9
Whitespace cleanups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Whitespace cleanups
manifest hash: ac954bc3a4f034c12638a259ecd65841f5b63c5c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwuubywK+sNU5EO8RAluIAJ98XQpNdZUpSmYKgDmrMRlbL76ZzQCfes0t
rknNUN/PhtyA4bzL646dOz4=
=UyCE
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Wed, 29 Jun 2005 10:42:35 -0800 |
| parents | 3b9e3d3d2810 |
| children | df8a5a0098d4 |
line wrap: on
line diff
--- a/mercurial/mdiff.py Tue Jun 28 11:06:25 2005 -0800 +++ b/mercurial/mdiff.py Wed Jun 29 10:42:35 2005 -0800 @@ -47,7 +47,7 @@ la = lb = 0 lena = len(a) lenb = len(b) - + while 1: am, bm, = la, lb @@ -65,14 +65,14 @@ if lb >= lenb: break - + # skip mismatched lines from a while la < lena and lb < lenb and b[lb] > a[la]: la += 1 if la >= lena: break - + yield (lena, lenb, 0) def diff(a, b, sorted=0): @@ -100,7 +100,7 @@ bin.append(struct.pack(">lll", p[la], p[am], len(s)) + s) la = am + size lb = bm + size - + return "".join(bin) def patchtext(bin):