Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/mdiff.py @ 4102:544838cc1158
Don't lie that "binary file has changed"
Without -a option to "hg diff", mdiff.unidiff reported that "Binary
file foo has changed" without even trying to compare things. Now it
computes MD5 of old and new files, compares them and makes the conclusion.
| author | tailgunner@smtp.ru |
|---|---|
| date | Sat, 17 Feb 2007 09:54:56 -0200 |
| parents | 096f1c73cdc3 |
| children | 226df1808f16 |
line wrap: on
line diff
--- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -7,7 +7,7 @@ from demandload import demandload import bdiff, mpatch -demandload(globals(), "re struct util") +demandload(globals(), "re struct util md5") def splitnewlines(text): '''like str.splitlines, but only split on newlines.''' @@ -59,6 +59,11 @@ def unidiff(a, ad, b, bd, fn, r=None, op epoch = util.datestr((0, 0)) if not opts.text and (util.binary(a) or util.binary(b)): + def h(v): + # md5 is used instead of sha1 because md5 is supposedly faster + return md5.new(v).digest() + if a and b and len(a) == len(b) and h(a) == h(b): + return "" l = ['Binary file %s has changed\n' % fn] elif not a: b = splitnewlines(b)