X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-rename.c;h=b80b4320ff6ea586d8d3c2800a7c42d68ccdd796;hb=28f7533f706d29b21fef199b9ad154df069fc624;hp=39d9126cb9d397df06d41495a3402123fa4ba46b;hpb=e5f5219a4f1faf3b4e1816fad3a6296a1d39b878;p=git.git

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 39d9126c..b80b4320 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -4,8 +4,6 @@
 #include "cache.h"
 #include "diff.h"
 #include "diffcore.h"
-#include "delta.h"
-#include "count-delta.h"
 
 /* Table of rename/copy destinations */
 
@@ -135,7 +133,6 @@ static int estimate_similarity(struct diff_filespec *src,
 	 * match than anything else; the destination does not even
 	 * call into this function in that case.
 	 */
-	void *delta;
 	unsigned long delta_size, base_size, src_copied, literal_added;
 	unsigned long delta_limit;
 	int score;
@@ -165,40 +162,24 @@ static int estimate_similarity(struct diff_filespec *src,
 	if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
 		return 0; /* error but caught downstream */
 
+
 	delta_limit = base_size * (MAX_SCORE-minimum_score) / MAX_SCORE;
-	delta = diff_delta(src->data, src->size,
-			   dst->data, dst->size,
-			   &delta_size, delta_limit);
-	if (!delta)
-		/* If delta_limit is exceeded, we have too much differences */
+	if (diffcore_count_changes(src->data, src->size,
+				   dst->data, dst->size,
+				   &src->cnt_data, &dst->cnt_data,
+				   delta_limit,
+				   &src_copied, &literal_added))
 		return 0;
 
-	/* A delta that has a lot of literal additions would have
-	 * big delta_size no matter what else it does.
+	/* How similar are they?
+	 * what percentage of material in dst are from source?
 	 */
-	if (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
-		return 0;
-
-	/* Estimate the edit size by interpreting delta. */
-	if (count_delta(delta, delta_size, &src_copied, &literal_added)) {
-		free(delta);
-		return 0;
-	}
-	free(delta);
-
-	/* Extent of damage */
-	if (src->size + literal_added < src_copied)
-		delta_size = 0;
+	if (dst->size < src_copied)
+		score = MAX_SCORE;
+	else if (!dst->size)
+		score = 0; /* should not happen */
 	else
-		delta_size = (src->size - src_copied) + literal_added;
-
-	/*
-	 * Now we will give some score to it.  100% edit gets 0 points
-	 * and 0% edit gets MAX_SCORE points.
-	 */
-	score = MAX_SCORE - (MAX_SCORE * delta_size / base_size); 
-	if (score < 0) return 0;
-	if (MAX_SCORE < score) return MAX_SCORE;
+		score = src_copied * MAX_SCORE / dst->size;
 	return score;
 }
 
@@ -326,6 +307,8 @@ void diffcore_rename(struct diff_options *options)
 			m->score = estimate_similarity(one, two,
 						       minimum_score);
 		}
+		free(two->cnt_data);
+		two->cnt_data = NULL;
 		dst_cnt++;
 	}
 	/* cost matrix sorted by most to least similar pair */