mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Tweak count-delta interface

Browse Source 
Make it return copied source and insertion separately, so that
later implementation of heuristics can use them more flexibly.

This does not change the heuristics implemented in
diffcore-rename nor diffcore-break in any way.

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-03 01:36:03 -07:00
committed by Linus Torvalds
parent 5b86040679
commit 355e76a4a3
5 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
diffcore-break.c
View File

@ -23,7 +23,7 @@ static int very_different(struct diff_filespec *src,
* want to get the filepair broken.
*/
void *delta;
unsigned long delta_size, base_size;
unsigned long delta_size, base_size, src_copied, literal_added;
if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
return 0; /* leave symlink rename alone */
@ -61,10 +61,17 @@ static int very_different(struct diff_filespec *src,
return MAX_SCORE;
/* Estimate the edit size by interpreting delta. */
delta_size = count_delta(delta, delta_size);
if (count_delta(delta, delta_size, &src_copied, &literal_added)) {
free(delta);
return 0;
}
free(delta);
if (delta_size == UINT_MAX)
return 0; /* error in delta computation */
/* Extent of damage */
if (src->size + literal_added < src_copied)
delta_size = 0;
else
delta_size = (src->size - src_copied) + literal_added;
if (base_size < delta_size)
return MAX_SCORE;