undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diffcore-rename: don't change similarity index based on basename equality

Browse Source 
This implements a suggestion from Johannes.  It uses a separate field in
struct diff_score to keep the result of the file name comparison in the
rename detection logic.  This reverts the value of the similarity index
to be a function of file contents, only, and basename comparison is only
used to decide between files with equal amounts of content changes.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2007-06-25 00:23:28 +02:00 committed by Junio C Hamano
parent aeb5932845
commit cfc0aef1ff
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
diffcore-rename.c
View File

@ -138,6 +138,7 @@ struct diff_score {
int src; /* index in rename_src */ int src; /* index in rename_src */
int dst; /* index in rename_dst */ int dst; /* index in rename_dst */
int score; int score;
int name_score;
}; };
static int estimate_similarity(struct diff_filespec *src, static int estimate_similarity(struct diff_filespec *src,
@ -201,11 +202,8 @@ static int estimate_similarity(struct diff_filespec *src,
*/ */
if (!dst->size) if (!dst->size)
score = 0; /* should not happen */ score = 0; /* should not happen */
else { else
score = (int)(src_copied * MAX_SCORE / max_size); score = (int)(src_copied * MAX_SCORE / max_size);
if (basename_same(src, dst))
score++;
}
return score; return score;
} }
@ -242,6 +240,10 @@ static void record_rename_pair(int dst_index, int src_index, int score)
static int score_compare(const void *a_, const void *b_) static int score_compare(const void *a_, const void *b_)
{ {
const struct diff_score *a = a_, *b = b_; const struct diff_score *a = a_, *b = b_;
if (a->score == b->score)
return b->name_score - a->name_score;
return b->score - a->score; return b->score - a->score;
} }
@ -360,6 +362,7 @@ void diffcore_rename(struct diff_options *options)
m->dst = i; m->dst = i;
m->score = estimate_similarity(one, two, m->score = estimate_similarity(one, two,
minimum_score); minimum_score);
m->name_score = basename_same(one, two);
diff_free_filespec_data(one); diff_free_filespec_data(one);
} }
/* We do not need the text anymore */ /* We do not need the text anymore */