diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-28 16:58:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 17:13:32 -0700 |
| commit | 75c660ac9373b588a7815fa922dac02b2e4519d4 (patch) | |
| tree | c1e78e9fd7b9eb452b6408bdaa65658692c33e98 /diffcore-rename.c | |
| parent | e1ddc9768469cb8c25387dc0c75dd4f40ea71096 (diff) | |
| download | git-75c660ac9373b588a7815fa922dac02b2e4519d4.tar.gz | |
[PATCH] Use enhanced diff_delta() in the similarity estimator.
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>
Diffstat (limited to 'diffcore-rename.c')
| -rw-r--r-- | diffcore-rename.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index 29609c74b6..6a52699f73 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -136,6 +136,7 @@ static int estimate_similarity(struct diff_filespec *src, */ void *delta; unsigned long delta_size, base_size, src_copied, literal_added; + unsigned long delta_limit; int score; /* 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)) return 0; /* error but caught downstream */ + delta_limit = base_size * (MAX_SCORE-minimum_score) / MAX_SCORE; delta = diff_delta(src->data, src->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 * big delta_size no matter what else it does. |