author | Bryan O'Sullivan <bos@serpentine.com> |
Mon, 30 Jul 2007 20:49:08 -0700 | |
changeset 5033 | 1b07668b8cc3 |
parent 5032 | 6dbd40b6307c |
child 5034 | c0417a319e39 |
--- a/mercurial/patch.py Mon Jul 30 20:48:50 2007 -0700 +++ b/mercurial/patch.py Mon Jul 30 20:49:08 2007 -0700 @@ -1057,7 +1057,7 @@ return files -def b85diff(fp, to, tn): +def b85diff(to, tn): '''print base85-encoded binary diff''' def gitindex(text): if not text: @@ -1244,7 +1244,7 @@ header.insert(0, 'diff --git a/%s b/%s\n' % (a, b)) if dodiff: if dodiff == 'binary': - text = b85diff(fp, to, tn) + text = b85diff(to, tn) else: text = mdiff.unidiff(to, date1, # ctx2 date may be dynamic