Mercurial > hg
changeset 4106:797dbdd4d7e1
git binary patches: don't print the header for identical files
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sat, 17 Feb 2007 09:55:00 -0200 |
| parents | ed46895aa38c |
| children | f5f171785e29 |
| files | mercurial/patch.py tests/test-diff-binary-file.out |
| diffstat | 2 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/patch.py Sat Feb 17 09:54:59 2007 -0200 +++ b/mercurial/patch.py Sat Feb 17 09:55:00 2007 -0200 @@ -415,14 +415,15 @@ tohash = gitindex(to) tnhash = gitindex(tn) if tohash == tnhash: - return + return "" + # TODO: deltas - fp.write('index %s..%s\nGIT binary patch\nliteral %s\n' % - (tohash, tnhash, len(tn))) - - tn = ''.join([fmtline(l) for l in chunk(zlib.compress(tn))]) - fp.write(tn) - fp.write('\n') + ret = ['index %s..%s\nGIT binary patch\nliteral %s\n' % + (tohash, tnhash, len(tn))] + for l in chunk(zlib.compress(tn)): + ret.append(fmtline(l)) + ret.append('\n') + return ''.join(ret) def diff(repo, node1=None, node2=None, files=None, match=util.always, fp=None, changes=None, opts=None): @@ -615,11 +616,11 @@ dodiff = 'binary' r = None header.insert(0, 'diff --git a/%s b/%s\n' % (a, b)) - if dodiff == 'binary': - fp.write(''.join(header)) - b85diff(fp, to, tn) - elif dodiff: - text = mdiff.unidiff(to, date1, tn, date2(f), f, r, opts=opts) + if dodiff: + if dodiff == 'binary': + text = b85diff(fp, to, tn) + else: + text = mdiff.unidiff(to, date1, tn, date2(f), f, r, opts=opts) if text or len(header) > 1: fp.write(''.join(header)) fp.write(text)