motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'js/diff' 

* js/diff:
  Fixed bug in scoring mechanism for rename detection
This commit is contained in:
Shawn O. Pearce 2010-08-04 10:59:35 -07:00
parent 3ba1c7c068 e64cb03065
commit 7514a6dbdc
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java
View File

@ -275,6 +275,21 @@ public void testInexactRename_NewlinesOnly() throws Exception {
assertRename(b, a, 74, entries.get(0));
}
public void testInexactRename_SameContentMultipleTimes() throws Exception {
ObjectId aId = blob("a\na\na\na\n");
ObjectId bId = blob("a\na\na\n");
DiffEntry a = DiffEntry.add(PATH_A, aId);
DiffEntry b = DiffEntry.delete(PATH_Q, bId);
rd.add(a);
rd.add(b);
List<DiffEntry> entries = rd.compute();
assertEquals(1, entries.size());
assertRename(b, a, 74, entries.get(0));
}
public void testInexactRenames_OnePair2() throws Exception {
ObjectId aId = blob("ab\nab\nab\nac\nad\nae\n");
ObjectId bId = blob("ac\nab\nab\nab\naa\na0\na1\n");

3
org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityIndex.java
View File

@ -216,7 +216,8 @@ private static int common(long[] srcHash, int srcIdx, //
for (;;) {
if (srcKey == dstKey) {
common += countOf(dstHash[dstIdx]);
common += Math.min(countOf(srcHash[srcIdx]),
countOf(dstHash[dstIdx]));
if (++srcIdx == srcHash.length)
break;