diffcore-rename.c 12.2 KB
Newer Older
1 2 3 4 5 6 7
/*
 * Copyright (C) 2005 Junio C Hamano
 */
#include "cache.h"
#include "diff.h"
#include "diffcore.h"

8 9 10 11 12 13 14
/* Table of rename/copy destinations */

static struct diff_rename_dst {
	struct diff_filespec *two;
	struct diff_filepair *pair;
} *rename_dst;
static int rename_dst_nr, rename_dst_alloc;
15

16 17
static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two,
						 int insert_ok)
18
{
19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
	int first, last;

	first = 0;
	last = rename_dst_nr;
	while (last > first) {
		int next = (last + first) >> 1;
		struct diff_rename_dst *dst = &(rename_dst[next]);
		int cmp = strcmp(two->path, dst->two->path);
		if (!cmp)
			return dst;
		if (cmp < 0) {
			last = next;
			continue;
		}
		first = next+1;
	}
	/* not found */
	if (!insert_ok)
		return NULL;
	/* insert to make it at "first" */
	if (rename_dst_alloc <= rename_dst_nr) {
		rename_dst_alloc = alloc_nr(rename_dst_alloc);
		rename_dst = xrealloc(rename_dst,
				      rename_dst_alloc * sizeof(*rename_dst));
	}
	rename_dst_nr++;
	if (first < rename_dst_nr)
		memmove(rename_dst + first + 1, rename_dst + first,
			(rename_dst_nr - first - 1) * sizeof(*rename_dst));
J
Junio C Hamano 已提交
48 49
	rename_dst[first].two = alloc_filespec(two->path);
	fill_filespec(rename_dst[first].two, two->sha1, two->mode);
50 51
	rename_dst[first].pair = NULL;
	return &(rename_dst[first]);
52 53
}

54
/* Table of rename/copy src files */
55 56
static struct diff_rename_src {
	struct diff_filespec *one;
57
	unsigned src_path_left : 1;
58 59
} *rename_src;
static int rename_src_nr, rename_src_alloc;
60

61
static struct diff_rename_src *register_rename_src(struct diff_filespec *one,
62
						   int src_path_left)
63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
{
	int first, last;

	first = 0;
	last = rename_src_nr;
	while (last > first) {
		int next = (last + first) >> 1;
		struct diff_rename_src *src = &(rename_src[next]);
		int cmp = strcmp(one->path, src->one->path);
		if (!cmp)
			return src;
		if (cmp < 0) {
			last = next;
			continue;
		}
		first = next+1;
	}
80

81 82 83 84 85
	/* insert to make it at "first" */
	if (rename_src_alloc <= rename_src_nr) {
		rename_src_alloc = alloc_nr(rename_src_alloc);
		rename_src = xrealloc(rename_src,
				      rename_src_alloc * sizeof(*rename_src));
86
	}
87 88 89 90 91
	rename_src_nr++;
	if (first < rename_src_nr)
		memmove(rename_src + first + 1, rename_src + first,
			(rename_src_nr - first - 1) * sizeof(*rename_src));
	rename_src[first].one = one;
92
	rename_src[first].src_path_left = src_path_left;
93
	return &(rename_src[first]);
94 95 96 97 98 99 100
}

static int is_exact_match(struct diff_filespec *src, struct diff_filespec *dst)
{
	if (src->sha1_valid && dst->sha1_valid &&
	    !memcmp(src->sha1, dst->sha1, 20))
		return 1;
101 102 103 104 105
	if (diff_populate_filespec(src, 1) || diff_populate_filespec(dst, 1))
		return 0;
	if (src->size != dst->size)
		return 0;
	if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
106 107 108 109 110 111 112 113
		return 0;
	if (src->size == dst->size &&
	    !memcmp(src->data, dst->data, src->size))
		return 1;
	return 0;
}

struct diff_score {
114 115
	int src; /* index in rename_src */
	int dst; /* index in rename_dst */
116 117 118 119 120 121 122 123 124 125 126 127 128 129
	int score;
};

static int estimate_similarity(struct diff_filespec *src,
			       struct diff_filespec *dst,
			       int minimum_score)
{
	/* src points at a file that existed in the original tree (or
	 * optionally a file in the destination tree) and dst points
	 * at a newly created file.  They may be quite similar, in which
	 * case we want to say src is renamed to dst or src is copied into
	 * dst, and then some edit has been applied to dst.
	 *
	 * Compare them and return how similar they are, representing
130 131 132 133 134
	 * the score as an integer between 0 and MAX_SCORE.
	 *
	 * When there is an exact match, it is considered a better
	 * match than anything else; the destination does not even
	 * call into this function in that case.
135
	 */
136
	unsigned long delta_size, base_size, src_copied, literal_added;
137
	unsigned long delta_limit;
138 139
	int score;

140 141 142 143 144 145 146
	/* We deal only with regular files.  Symlink renames are handled
	 * only when they are exact matches --- in other words, no edits
	 * after renaming.
	 */
	if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
		return 0;

147 148
	delta_size = ((src->size < dst->size) ?
		      (dst->size - src->size) : (src->size - dst->size));
149
	base_size = ((src->size < dst->size) ? src->size : dst->size);
150

151 152
	/* We would not consider edits that change the file size so
	 * drastically.  delta_size must be smaller than
153
	 * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size).
154
	 *
155 156 157
	 * Note that base_size == 0 case is handled here already
	 * and the final score computation below would not have a
	 * divide-by-zero issue.
158
	 */
159
	if (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
160 161
		return 0;

162 163 164
	if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
		return 0; /* error but caught downstream */

165

166 167 168
	delta_limit = base_size * (MAX_SCORE-minimum_score) / MAX_SCORE;
	if (diffcore_count_changes(src->data, src->size,
				   dst->data, dst->size,
169
				   &src->cnt_data, &dst->cnt_data,
170 171
				   delta_limit,
				   &src_copied, &literal_added))
172
		return 0;
173

174 175
	/* How similar are they?
	 * what percentage of material in dst are from source?
176
	 */
177 178 179 180 181 182
	if (dst->size < src_copied)
		score = MAX_SCORE;
	else if (!dst->size)
		score = 0; /* should not happen */
	else
		score = src_copied * MAX_SCORE / dst->size;
183 184 185
	return score;
}

J
Junio C Hamano 已提交
186
static void record_rename_pair(int dst_index, int src_index, int score)
187
{
188 189
	struct diff_filespec *one, *two, *src, *dst;
	struct diff_filepair *dp;
190

191 192
	if (rename_dst[dst_index].pair)
		die("internal error: dst already matched.");
193

194 195 196
	src = rename_src[src_index].one;
	one = alloc_filespec(src->path);
	fill_filespec(one, src->sha1, src->mode);
197

198 199 200
	dst = rename_dst[dst_index].two;
	two = alloc_filespec(dst->path);
	fill_filespec(two, dst->sha1, dst->mode);
201

J
Junio C Hamano 已提交
202
	dp = diff_queue(NULL, one, two);
203
	dp->score = score;
204
	dp->source_stays = rename_src[src_index].src_path_left;
205
	rename_dst[dst_index].pair = dp;
206 207 208 209
}

/*
 * We sort the rename similarity matrix with the score, in descending
210
 * order (the most similar first).
211 212 213 214 215 216 217
 */
static int score_compare(const void *a_, const void *b_)
{
	const struct diff_score *a = a_, *b = b_;
	return b->score - a->score;
}

218 219 220 221 222 223 224 225 226 227 228 229 230 231 232
static int compute_stays(struct diff_queue_struct *q,
			 struct diff_filespec *one)
{
	int i;
	for (i = 0; i < q->nr; i++) {
		struct diff_filepair *p = q->queue[i];
		if (strcmp(one->path, p->two->path))
			continue;
		if (DIFF_PAIR_RENAME(p)) {
			return 0; /* something else is renamed into this */
		}
	}
	return 1;
}

233
void diffcore_rename(struct diff_options *options)
234
{
235 236 237
	int detect_rename = options->detect_rename;
	int minimum_score = options->rename_score;
	int rename_limit = options->rename_limit;
238
	struct diff_queue_struct *q = &diff_queued_diff;
J
Junio C Hamano 已提交
239
	struct diff_queue_struct outq;
240
	struct diff_score *mx;
J
Junio C Hamano 已提交
241
	int i, j, rename_count;
242
	int num_create, num_src, dst_cnt;
243

244
	if (!minimum_score)
245
		minimum_score = DEFAULT_RENAME_SCORE;
J
Junio C Hamano 已提交
246
	rename_count = 0;
247 248

	for (i = 0; i < q->nr; i++) {
249
		struct diff_filepair *p = q->queue[i];
250 251
		if (!DIFF_FILE_VALID(p->one))
			if (!DIFF_FILE_VALID(p->two))
252
				continue; /* unmerged */
253
			else
254
				locate_rename_dst(p->two, 1);
255 256 257 258 259 260 261 262
		else if (!DIFF_FILE_VALID(p->two)) {
			/* If the source is a broken "delete", and
			 * they did not really want to get broken,
			 * that means the source actually stays.
			 */
			int stays = (p->broken_pair && !p->score);
			register_rename_src(p->one, stays);
		}
263 264
		else if (detect_rename == DIFF_DETECT_COPY)
			register_rename_src(p->one, 1);
265
	}
266
	if (rename_dst_nr == 0 || rename_src_nr == 0 ||
267
	    (0 < rename_limit && rename_limit < rename_dst_nr))
268 269 270 271 272
		goto cleanup; /* nothing to do */

	/* We really want to cull the candidates list early
	 * with cheap tests in order to avoid doing deltas.
	 */
273 274 275 276 277 278
	for (i = 0; i < rename_dst_nr; i++) {
		struct diff_filespec *two = rename_dst[i].two;
		for (j = 0; j < rename_src_nr; j++) {
			struct diff_filespec *one = rename_src[j].one;
			if (!is_exact_match(one, two))
				continue;
J
Junio C Hamano 已提交
279 280
			record_rename_pair(i, j, MAX_SCORE);
			rename_count++;
281
			break; /* we are done with this entry */
282 283 284 285 286 287
		}
	}

	/* Have we run out the created file pool?  If so we can avoid
	 * doing the delta matrix altogether.
	 */
J
Junio C Hamano 已提交
288
	if (rename_count == rename_dst_nr)
289
		goto cleanup;
290

291 292 293
	if (minimum_score == MAX_SCORE)
		goto cleanup;

J
Junio C Hamano 已提交
294
	num_create = (rename_dst_nr - rename_count);
295
	num_src = rename_src_nr;
296
	mx = xmalloc(sizeof(*mx) * num_create * num_src);
297
	for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
298
		int base = dst_cnt * num_src;
299 300
		struct diff_filespec *two = rename_dst[i].two;
		if (rename_dst[i].pair)
301
			continue; /* dealt with exact match already. */
302 303 304 305 306 307 308
		for (j = 0; j < rename_src_nr; j++) {
			struct diff_filespec *one = rename_src[j].one;
			struct diff_score *m = &mx[base+j];
			m->src = j;
			m->dst = i;
			m->score = estimate_similarity(one, two,
						       minimum_score);
309
		}
310 311
		/* We do not need the text anymore */
		diff_free_filespec_data(two);
312 313 314 315 316
		dst_cnt++;
	}
	/* cost matrix sorted by most to least similar pair */
	qsort(mx, num_create * num_src, sizeof(*mx), score_compare);
	for (i = 0; i < num_create * num_src; i++) {
317 318 319
		struct diff_rename_dst *dst = &rename_dst[mx[i].dst];
		if (dst->pair)
			continue; /* already done, either exact or fuzzy. */
320
		if (mx[i].score < minimum_score)
321
			break; /* there is no more usable pair. */
J
Junio C Hamano 已提交
322 323
		record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
		rename_count++;
324 325 326
	}
	free(mx);

327
 cleanup:
328
	/* At this point, we have found some renames and copies and they
J
Junio C Hamano 已提交
329
	 * are recorded in rename_dst.  The original list is still in *q.
330
	 */
331 332
	outq.queue = NULL;
	outq.nr = outq.alloc = 0;
333
	for (i = 0; i < q->nr; i++) {
334 335 336
		struct diff_filepair *p = q->queue[i];
		struct diff_filepair *pair_to_free = NULL;

337 338 339 340 341 342 343 344 345 346
		if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
			/*
			 * Creation
			 *
			 * We would output this create record if it has
			 * not been turned into a rename/copy already.
			 */
			struct diff_rename_dst *dst =
				locate_rename_dst(p->two, 0);
			if (dst && dst->pair) {
347 348 349 350
				diff_q(&outq, dst->pair);
				pair_to_free = p;
			}
			else
351 352
				/* no matching rename/copy source, so
				 * record this as a creation.
353 354
				 */
				diff_q(&outq, p);
355
		}
356 357 358 359
		else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
			/*
			 * Deletion
			 *
360 361 362 363
			 * We would output this delete record if:
			 *
			 * (1) this is a broken delete and the counterpart
			 *     broken create remains in the output; or
J
Junio C Hamano 已提交
364 365 366
			 * (2) this is not a broken delete, and rename_dst
			 *     does not have a rename/copy to move p->one->path
			 *     out of existence.
367 368 369 370 371
			 *
			 * Otherwise, the counterpart broken create
			 * has been turned into a rename-edit; or
			 * delete did not have a matching create to
			 * begin with.
372
			 */
373 374 375 376 377 378 379 380 381
			if (DIFF_PAIR_BROKEN(p)) {
				/* broken delete */
				struct diff_rename_dst *dst =
					locate_rename_dst(p->one, 0);
				if (dst && dst->pair)
					/* counterpart is now rename/copy */
					pair_to_free = p;
			}
			else {
J
Junio C Hamano 已提交
382 383 384 385 386 387 388 389 390 391
				for (j = 0; j < rename_dst_nr; j++) {
					if (!rename_dst[j].pair)
						continue;
					if (strcmp(rename_dst[j].pair->
						   one->path,
						   p->one->path))
						continue;
					break;
				}
				if (j < rename_dst_nr)
392 393 394
					/* this path remains */
					pair_to_free = p;
			}
395 396 397 398 399 400

			if (pair_to_free)
				;
			else
				diff_q(&outq, p);
		}
401
		else if (!diff_unmodified_pair(p))
402
			/* all the usual ones need to be kept */
403
			diff_q(&outq, p);
404 405 406 407
		else
			/* no need to keep unmodified pairs */
			pair_to_free = p;

408 409
		if (pair_to_free)
			diff_free_filepair(pair_to_free);
410
	}
411
	diff_debug_queue("done copying original", &outq);
412

413 414 415
	free(q->queue);
	*q = outq;
	diff_debug_queue("done collapsing", q);
416

417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433
	/* We need to see which rename source really stays here;
	 * earlier we only checked if the path is left in the result,
	 * but even if a path remains in the result, if that is coming
	 * from copying something else on top of it, then the original
	 * source is lost and does not stay.
	 */
	for (i = 0; i < q->nr; i++) {
		struct diff_filepair *p = q->queue[i];
		if (DIFF_PAIR_RENAME(p) && p->source_stays) {
			/* If one appears as the target of a rename-copy,
			 * then mark p->source_stays = 0; otherwise
			 * leave it as is.
			 */
			p->source_stays = compute_stays(q, p->one);
		}
	}

J
Junio C Hamano 已提交
434 435 436 437 438
	for (i = 0; i < rename_dst_nr; i++) {
		diff_free_filespec_data(rename_dst[i].two);
		free(rename_dst[i].two);
	}

439 440 441 442 443 444
	free(rename_dst);
	rename_dst = NULL;
	rename_dst_nr = rename_dst_alloc = 0;
	free(rename_src);
	rename_src = NULL;
	rename_src_nr = rename_src_alloc = 0;
445 446
	return;
}