From 9f2249bd26199f6b79b72bff8328e18a0935191b Mon Sep 17 00:00:00 2001 From: Jeff Schumacher Date: Tue, 29 Jun 2010 16:04:08 -0700 Subject: Added check for binary files while diffing Added a check in Diff to ensure that files that are most likely not text are not line-by-line diffed. Files are determined to be binary by checking the first 8000 bytes for a null character. This is a similar heuristic to what C Git uses. Change-Id: I2b6f05674c88d89b3f549a5db483f850f7f46c26 --- .../src/org/eclipse/jgit/pgm/Diff.java | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'org.eclipse.jgit.pgm/src/org/eclipse/jgit') diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java index 931c46d333..fc1e400ab0 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java @@ -132,16 +132,28 @@ class Diff extends TextBuiltin { + (mode1.equals(mode2) ? " " + mode1 : "")); out.println("--- " + (isNew ? "/dev/null" : name1)); out.println("+++ " + (isDelete ? "/dev/null" : name2)); - RawText a = getRawText(id1); - RawText b = getRawText(id2); + + byte[] aRaw = getRawBytes(id1); + byte[] bRaw = getRawBytes(id2); + + if (RawText.isBinary(aRaw) || RawText.isBinary(bRaw)) { + out.println("Binary files differ"); + return; + } + + RawText a = getRawText(aRaw); + RawText b = getRawText(bRaw); MyersDiff diff = new MyersDiff(a, b); fmt.formatEdits(out, a, b, diff.getEdits()); } - private RawText getRawText(ObjectId id) throws IOException { + private byte[] getRawBytes(ObjectId id) throws IOException { if (id.equals(ObjectId.zeroId())) - return new RawText(new byte[] {}); - byte[] raw = db.openBlob(id).getCachedBytes(); + return new byte[] {}; + return db.openBlob(id).getCachedBytes(); + } + + private RawText getRawText(byte[] raw) { if (ignoreWsAll) return new RawTextIgnoreAllWhitespace(raw); else if (ignoreWsTrailing) @@ -154,4 +166,3 @@ class Diff extends TextBuiltin { return new RawText(raw); } } - -- cgit v1.2.3