opendev/gerrit
Code Issues Proposed changes

Update JGit to 0.9.3.79-g5c135a5

Browse Source 
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>
This commit is contained in:
Shawn O. Pearce
2010-10-12 12:59:54 -07:00
parent fef8433523
commit ed54ec42dc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
View File

@@ -289,7 +289,7 @@ public class PatchListCacheImpl implements PatchListCache {
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 @@ public class PatchListCacheImpl implements PatchListCache {
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