diffcore-rename: fix merging back a broken pair.
When a broken pair is matched up by rename detector to be merged back, we do not want to say it is "dissimilar" with the similarity index. The output should just say they were changed, taking the break score left by the earlier diffcore-break run if any. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Apr 8, 2006 at 20:17 UTC
fc5807190ef700d01e25968f48438736f18ae3dc
1 file changed
+10
-4
diffcore-rename.c
+10
-4
@@ -54,12 +54,14 @@ static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two,
54
/* Table of rename/copy src files */
55
static struct diff_rename_src {
56
struct diff_filespec *one;
57
+ unsigned short score; /* to remember the break score */
58
unsigned src_path_left : 1;
59
} *rename_src;
60
static int rename_src_nr, rename_src_alloc;
61
62
static struct diff_rename_src *register_rename_src(struct diff_filespec *one,
62
- int src_path_left)
63
+ int src_path_left,
64
+ unsigned short score)
65
{
66
int first, last;
67
@@ -89,6 +91,7 @@ static struct diff_rename_src *register_rename_src(struct diff_filespec *one,
91
memmove(rename_src + first + 1, rename_src + first,
92
(rename_src_nr - first - 1) * sizeof(*rename_src));
93
rename_src[first].one = one;
94
+ rename_src[first].score = score;
95
rename_src[first].src_path_left = src_path_left;
96
return &(rename_src[first]);
97
}
@@ -198,7 +201,10 @@ static void record_rename_pair(int dst_index, int src_index, int score)
201
fill_filespec(two, dst->sha1, dst->mode);
202
203
dp = diff_queue(NULL, one, two);
201
- dp->score = score;
204
+ if (!strcmp(src->path, dst->path))
205
+ dp->score = rename_src[src_index].score;
206
+ else
207
+ dp->score = score;
208
dp->source_stays = rename_src[src_index].src_path_left;
209
rename_dst[dst_index].pair = dp;
210
}
@@ -256,10 +262,10 @@ void diffcore_rename(struct diff_options *options)
262
* that means the source actually stays.
263
*/
264
int stays = (p->broken_pair && !p->score);
259
- register_rename_src(p->one, stays);
265
+ register_rename_src(p->one, stays, p->score);
266
}
267
else if (detect_rename == DIFF_DETECT_COPY)
262
- register_rename_src(p->one, 1);
268
+ register_rename_src(p->one, 1, p->score);
269
}
270
if (rename_dst_nr == 0 || rename_src_nr == 0 ||
271
(0 < rename_limit && rename_limit < rename_dst_nr))