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

[PATCH] Use enhanced diff_delta() in the similarity estimator.

Browse Source 
The diff_delta() interface was extended to reject generating too big a
delta while we were working on the packed GIT archive format.

Take advantage of that when generating delta in the similarity estimator
used in diffcore-rename.c

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano 2005-06-28 16:58:27 -07:00 committed by Linus Torvalds
parent e1ddc97684
commit 75c660ac93
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
diffcore-rename.c
View File

@ -136,6 +136,7 @@ static int estimate_similarity(struct diff_filespec *src,
*/ */
void *delta; void *delta;
unsigned long delta_size, base_size, src_copied, literal_added; unsigned long delta_size, base_size, src_copied, literal_added;
unsigned long delta_limit;
int score; int score;
/* We deal only with regular files. Symlink renames are handled /* We deal only with regular files. Symlink renames are handled
@ -163,9 +164,13 @@ static int estimate_similarity(struct diff_filespec *src,
if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0)) if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
return 0; /* error but caught downstream */ return 0; /* error but caught downstream */
delta_limit = base_size * (MAX_SCORE-minimum_score) / MAX_SCORE;
delta = diff_delta(src->data, src->size, delta = diff_delta(src->data, src->size,
dst->data, dst->size, dst->data, dst->size,
&delta_size, ~0UL); &delta_size, delta_limit);
if (!delta)
/* If delta_limit is exceeded, we have too much differences */
return 0;
/* A delta that has a lot of literal additions would have /* A delta that has a lot of literal additions would have
* big delta_size no matter what else it does. * big delta_size no matter what else it does.