diffcore-rename: record filepair for rename src
This will allow us to later skip unmodified entries added due to "-C -C". We might also want to do something similar to rename_dst side, but that would only be for the sake of symmetry and not necessary for this series. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 6, 2011 at 13:50 UTC
e88d6bc6f90059f6e87f6d51eba83ec15e4eecc9
1 file changed
+12
-11
diffcore-rename.c
+12
-11
@@ -55,22 +55,23 @@ static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two,
55
56
/* Table of rename/copy src files */
57
static struct diff_rename_src {
58
- struct diff_filespec *one;
58
+ struct diff_filepair *p;
59
unsigned short score; /* to remember the break score */
60
} *rename_src;
61
static int rename_src_nr, rename_src_alloc;
62
63
-static struct diff_rename_src *register_rename_src(struct diff_filespec *one,
64
- unsigned short score)
63
+static struct diff_rename_src *register_rename_src(struct diff_filepair *p)
64
{
65
int first, last;
66
+ struct diff_filespec *one = p->one;
67
+ unsigned short score = p->score;
68
69
first = 0;
70
last = rename_src_nr;
71
while (last > first) {
72
int next = (last + first) >> 1;
73
struct diff_rename_src *src = &(rename_src[next]);
73
- int cmp = strcmp(one->path, src->one->path);
74
+ int cmp = strcmp(one->path, src->p->one->path);
75
if (!cmp)
76
return src;
77
if (cmp < 0) {
@@ -90,7 +91,7 @@ static struct diff_rename_src *register_rename_src(struct diff_filespec *one,
91
if (first < rename_src_nr)
92
memmove(rename_src + first + 1, rename_src + first,
93
(rename_src_nr - first - 1) * sizeof(*rename_src));
93
- rename_src[first].one = one;
94
+ rename_src[first].p = p;
95
rename_src[first].score = score;
96
return &(rename_src[first]);
97
}
@@ -205,7 +206,7 @@ static void record_rename_pair(int dst_index, int src_index, int score)
206
if (rename_dst[dst_index].pair)
207
die("internal error: dst already matched.");
208
208
- src = rename_src[src_index].one;
209
+ src = rename_src[src_index].p->one;
210
src->rename_used++;
211
src->count++;
212
@@ -389,7 +390,7 @@ static int find_exact_renames(struct diff_options *options)
390
391
init_hash(&file_table);
392
for (i = 0; i < rename_src_nr; i++)
392
- insert_file_table(&file_table, -1, i, rename_src[i].one);
393
+ insert_file_table(&file_table, -1, i, rename_src[i].p->one);
394
395
for (i = 0; i < rename_dst_nr; i++)
396
insert_file_table(&file_table, 1, i, rename_dst[i].two);
@@ -460,7 +461,7 @@ static int find_renames(struct diff_score *mx, int dst_cnt, int minimum_score, i
461
dst = &rename_dst[mx[i].dst];
462
if (dst->pair)
463
continue; /* already done, either exact or fuzzy. */
463
- if (!copies && rename_src[mx[i].src].one->rename_used)
464
+ if (!copies && rename_src[mx[i].src].p->one->rename_used)
465
continue;
466
record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
467
count++;
@@ -503,7 +504,7 @@ void diffcore_rename(struct diff_options *options)
504
*/
505
if (p->broken_pair && !p->score)
506
p->one->rename_used++;
506
- register_rename_src(p->one, p->score);
507
+ register_rename_src(p);
508
}
509
else if (detect_rename == DIFF_DETECT_COPY) {
510
/*
@@ -511,7 +512,7 @@ void diffcore_rename(struct diff_options *options)
512
* one, to indicate ourselves as a user.
513
*/
514
p->one->rename_used++;
514
- register_rename_src(p->one, p->score);
515
+ register_rename_src(p);
516
}
517
}
518
if (rename_dst_nr == 0 || rename_src_nr == 0)
@@ -560,7 +561,7 @@ void diffcore_rename(struct diff_options *options)
561
m[j].dst = -1;
562
563
for (j = 0; j < rename_src_nr; j++) {
563
- struct diff_filespec *one = rename_src[j].one;
564
+ struct diff_filespec *one = rename_src[j].p->one;
565
struct diff_score this_src;
566
this_src.score = estimate_similarity(one, two,
567
minimum_score);