Mercurial > public > mercurial-scm > hg
comparison mercurial/mdiff.py @ 317:b18ce742566a
hg commit: user and date options
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg commit: user and date options
- From Ted Ts'o
manifest hash: f6ce29eed387664c6f0631b666158eb930876cb3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCrHx4ywK+sNU5EO8RAp/uAKCEGhvm1tpBJ9Bub8BlalWaIpMeqgCfUejo
IoevMbk4cjxQ5P3Zo2pSFs8=
=Ibp3
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sun, 12 Jun 2005 10:18:32 -0800 |
parents | 777e388c06d6 |
children | 2819f63b16bf |
comparison
equal
deleted
inserted
replaced
316:c48d069163d6 | 317:b18ce742566a |
---|---|
65 bin = [] | 65 bin = [] |
66 p = [0] | 66 p = [0] |
67 for i in a: p.append(p[-1] + len(i)) | 67 for i in a: p.append(p[-1] + len(i)) |
68 | 68 |
69 if sorted: | 69 if sorted: |
70 d = sortdiff(a, b) | 70 try: |
71 d = sortdiff(a, b) | |
72 except: | |
73 print a, b | |
74 raise | |
71 else: | 75 else: |
72 d = difflib.SequenceMatcher(None, a, b).get_matching_blocks() | 76 d = difflib.SequenceMatcher(None, a, b).get_matching_blocks() |
73 la = 0 | 77 la = 0 |
74 lb = 0 | 78 lb = 0 |
75 for am, bm, size in d: | 79 for am, bm, size in d: |