Update JGit to 0.9.3.79-g5c135a5
This version of JGit switches the DiffFormatter factory to use
HistogramDiff by default, which is derived from patience diff and
tends to produce more readable results on source code.
Change-Id: Ic9218e899f24d8d6d65334f9d5986f7b75a1feac
Signed-off-by: Shawn O. Pearce <sop@google.com>
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
index 385eea9..328e97b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
@@ -289,7 +289,7 @@
byte[] rawHdr = hdr.toString().getBytes("UTF-8");
RawText aRawText = new RawText(cmp, aText.getContent());
RawText bRawText = new RawText(cmp, bText.getContent());
- EditList edits = new MyersDiff(cmp, aRawText, bRawText).getEdits();
+ EditList edits = MyersDiff.INSTANCE.diff(cmp, aRawText, bRawText);
FileHeader fh = new FileHeader(rawHdr, edits, PatchType.UNIFIED);
return newEntry(reader, aText, bText, edits, null, null, fh);
}
@@ -346,7 +346,7 @@
CharText b = new CharText(bContent, e.getBeginB(), e.getEndB());
CharTextComparator cmp = new CharTextComparator();
- List<Edit> wordEdits = new MyersDiff(cmp, a, b).getEdits();
+ List<Edit> wordEdits = MyersDiff.INSTANCE.diff(cmp, a, b);
// Combine edits that are really close together. If they are
// just a few characters apart we tend to get better results
diff --git a/pom.xml b/pom.xml
index 0c81e48..13659e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
</issueManagement>
<properties>
- <jgitVersion>0.8.4.403-ga424b7a</jgitVersion>
+ <jgitVersion>0.9.3.79-g5c135a5</jgitVersion>
<gwtormVersion>1.1.4</gwtormVersion>
<gwtjsonrpcVersion>1.2.2</gwtjsonrpcVersion>
<gwtexpuiVersion>1.2.2</gwtexpuiVersion>
