3098 it and use the file content directly. |
3098 it and use the file content directly. |
3099 """ |
3099 """ |
3100 |
3100 |
3101 ctx1, fctx1, path1, flag1, content1, date1 = data1 |
3101 ctx1, fctx1, path1, flag1, content1, date1 = data1 |
3102 ctx2, fctx2, path2, flag2, content2, date2 = data2 |
3102 ctx2, fctx2, path2, flag2, content2, date2 = data2 |
3103 index1 = _gitindex(content1) if path1 in ctx1 else nullhex |
3103 index1 = _gitindex(content1) if path1 in ctx1 else sha1nodeconstants.nullhex |
3104 index2 = _gitindex(content2) if path2 in ctx2 else nullhex |
3104 index2 = _gitindex(content2) if path2 in ctx2 else sha1nodeconstants.nullhex |
3105 if binary and opts.git and not opts.nobinary: |
3105 if binary and opts.git and not opts.nobinary: |
3106 text = mdiff.b85diff(content1, content2) |
3106 text = mdiff.b85diff(content1, content2) |
3107 if text: |
3107 if text: |
3108 header.append(b'index %s..%s' % (index1, index2)) |
3108 header.append(b'index %s..%s' % (index1, index2)) |
3109 hunks = ((None, [text]),) |
3109 hunks = ((None, [text]),) |