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

10 11 12 13 14 15 16
/* 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;
17

18 19
static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two,
						 int insert_ok)
20
{
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
	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" */
41
	ALLOC_GROW(rename_dst, rename_dst_nr + 1, rename_dst_alloc);
42 43 44 45
	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 已提交
46
	rename_dst[first].two = alloc_filespec(two->path);
47
	fill_filespec(rename_dst[first].two, two->sha1, two->sha1_valid, two->mode);
48 49
	rename_dst[first].pair = NULL;
	return &(rename_dst[first]);
50 51
}

52
/* Table of rename/copy src files */
53
static struct diff_rename_src {
54
	struct diff_filepair *p;
55
	unsigned short score; /* to remember the break score */
56 57
} *rename_src;
static int rename_src_nr, rename_src_alloc;
58

59
static struct diff_rename_src *register_rename_src(struct diff_filepair *p)
60 61
{
	int first, last;
62 63
	struct diff_filespec *one = p->one;
	unsigned short score = p->score;
64 65 66 67 68 69

	first = 0;
	last = rename_src_nr;
	while (last > first) {
		int next = (last + first) >> 1;
		struct diff_rename_src *src = &(rename_src[next]);
70
		int cmp = strcmp(one->path, src->p->one->path);
71 72 73 74 75 76 77 78
		if (!cmp)
			return src;
		if (cmp < 0) {
			last = next;
			continue;
		}
		first = next+1;
	}
79

80
	/* insert to make it at "first" */
81
	ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc);
82 83 84 85
	rename_src_nr++;
	if (first < rename_src_nr)
		memmove(rename_src + first + 1, rename_src + first,
			(rename_src_nr - first - 1) * sizeof(*rename_src));
86
	rename_src[first].p = p;
87
	rename_src[first].score = score;
88
	return &(rename_src[first]);
89 90
}

91 92 93 94 95 96 97 98 99 100 101 102 103 104 105
static int basename_same(struct diff_filespec *src, struct diff_filespec *dst)
{
	int src_len = strlen(src->path), dst_len = strlen(dst->path);
	while (src_len && dst_len) {
		char c1 = src->path[--src_len];
		char c2 = dst->path[--dst_len];
		if (c1 != c2)
			return 0;
		if (c1 == '/')
			return 1;
	}
	return (!src_len || src->path[src_len - 1] == '/') &&
		(!dst_len || dst->path[dst_len - 1] == '/');
}

106
struct diff_score {
107 108
	int src; /* index in rename_src */
	int dst; /* index in rename_dst */
109 110
	unsigned short score;
	short name_score;
111 112 113 114 115 116 117 118 119 120 121 122 123
};

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
124 125 126 127 128
	 * 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.
129
	 */
L
Linus Torvalds 已提交
130
	unsigned long max_size, delta_size, base_size, src_copied, literal_added;
131
	unsigned long delta_limit;
132 133
	int score;

134 135 136 137 138 139 140
	/* 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;

141 142 143 144 145 146 147 148 149
	/*
	 * Need to check that source and destination sizes are
	 * filled in before comparing them.
	 *
	 * If we already have "cnt_data" filled in, we know it's
	 * all good (avoid checking the size for zero, as that
	 * is a possible size - we really should have a flag to
	 * say whether the size is valid or not!)
	 */
150
	if (!src->cnt_data && diff_populate_filespec(src, 1))
151
		return 0;
152
	if (!dst->cnt_data && diff_populate_filespec(dst, 1))
153 154
		return 0;

L
Linus Torvalds 已提交
155
	max_size = ((src->size > dst->size) ? src->size : dst->size);
156
	base_size = ((src->size < dst->size) ? src->size : dst->size);
L
Linus Torvalds 已提交
157
	delta_size = max_size - base_size;
158

159 160
	/* We would not consider edits that change the file size so
	 * drastically.  delta_size must be smaller than
161
	 * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size).
162
	 *
163 164 165
	 * Note that base_size == 0 case is handled here already
	 * and the final score computation below would not have a
	 * divide-by-zero issue.
166
	 */
167
	if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
168 169
		return 0;

170 171 172 173 174
	if (!src->cnt_data && diff_populate_filespec(src, 0))
		return 0;
	if (!dst->cnt_data && diff_populate_filespec(dst, 0))
		return 0;

175 176
	delta_limit = (unsigned long)
		(base_size * (MAX_SCORE-minimum_score) / MAX_SCORE);
177
	if (diffcore_count_changes(src, dst,
178
				   &src->cnt_data, &dst->cnt_data,
179 180
				   delta_limit,
				   &src_copied, &literal_added))
181
		return 0;
182

183 184
	/* How similar are they?
	 * what percentage of material in dst are from source?
185
	 */
L
Linus Torvalds 已提交
186
	if (!dst->size)
187
		score = 0; /* should not happen */
188
	else
189
		score = (int)(src_copied * MAX_SCORE / max_size);
190 191 192
	return score;
}

J
Junio C Hamano 已提交
193
static void record_rename_pair(int dst_index, int src_index, int score)
194
{
195
	struct diff_filespec *src, *dst;
196
	struct diff_filepair *dp;
197

198 199
	if (rename_dst[dst_index].pair)
		die("internal error: dst already matched.");
200

201
	src = rename_src[src_index].p->one;
202
	src->rename_used++;
203
	src->count++;
204

205
	dst = rename_dst[dst_index].two;
206
	dst->count++;
207

208
	dp = diff_queue(NULL, src, dst);
209
	dp->renamed_pair = 1;
210 211 212 213
	if (!strcmp(src->path, dst->path))
		dp->score = rename_src[src_index].score;
	else
		dp->score = score;
214
	rename_dst[dst_index].pair = dp;
215 216 217 218
}

/*
 * We sort the rename similarity matrix with the score, in descending
219
 * order (the most similar first).
220 221 222 223
 */
static int score_compare(const void *a_, const void *b_)
{
	const struct diff_score *a = a_, *b = b_;
224

225 226 227 228 229 230
	/* sink the unused ones to the bottom */
	if (a->dst < 0)
		return (0 <= b->dst);
	else if (b->dst < 0)
		return -1;

231 232 233
	if (a->score == b->score)
		return b->name_score - a->name_score;

234 235 236
	return b->score - a->score;
}

237
struct file_similarity {
238
	struct hashmap_entry entry;
239
	int index;
240 241 242
	struct diff_filespec *filespec;
};

243 244 245 246 247 248 249 250 251 252 253 254
static unsigned int hash_filespec(struct diff_filespec *filespec)
{
	unsigned int hash;
	if (!filespec->sha1_valid) {
		if (diff_populate_filespec(filespec, 0))
			return 0;
		hash_sha1_file(filespec->data, filespec->size, "blob", filespec->sha1);
	}
	memcpy(&hash, filespec->sha1, sizeof(hash));
	return hash;
}

255
static int find_identical_files(struct hashmap *srcs,
256
				int dst_index,
257
				struct diff_options *options)
258 259 260
{
	int renames = 0;

261
	struct diff_filespec *target = rename_dst[dst_index].two;
262
	struct file_similarity *p, *best, dst;
263 264 265
	int i = 100, best_score = -1;

	/*
266
	 * Find the best source match for specified destination.
267 268
	 */
	best = NULL;
269 270
	hashmap_entry_init(&dst, hash_filespec(target));
	for (p = hashmap_get(srcs, &dst, NULL); p; p = hashmap_get_next(srcs, p)) {
271 272 273 274 275 276 277 278 279
		int score;
		struct diff_filespec *source = p->filespec;

		/* False hash collision? */
		if (hashcmp(source->sha1, target->sha1))
			continue;
		/* Non-regular files? If so, the modes must match! */
		if (!S_ISREG(source->mode) || !S_ISREG(target->mode)) {
			if (source->mode != target->mode)
280
				continue;
281
		}
282 283 284 285 286 287 288 289 290 291
		/* Give higher scores to sources that haven't been used already */
		score = !source->rename_used;
		if (source->rename_used && options->detect_rename != DIFF_DETECT_COPY)
			continue;
		score += basename_same(source, target);
		if (score > best_score) {
			best = p;
			best_score = score;
			if (score == 2)
				break;
292
		}
293 294 295 296 297 298

		/* Too many identical alternatives? Pick one */
		if (!--i)
			break;
	}
	if (best) {
299
		record_rename_pair(dst_index, best->index, MAX_SCORE);
300 301
		renames++;
	}
302 303 304
	return renames;
}

305
static void insert_file_table(struct hashmap *table, int index, struct diff_filespec *filespec)
306 307 308 309 310 311
{
	struct file_similarity *entry = xmalloc(sizeof(*entry));

	entry->index = index;
	entry->filespec = filespec;

312 313
	hashmap_entry_init(entry, hash_filespec(filespec));
	hashmap_add(table, entry);
314 315
}

316 317 318 319 320 321 322
/*
 * Find exact renames first.
 *
 * The first round matches up the up-to-date entries,
 * and then during the second round we try to match
 * cache-dirty entries as well.
 */
323
static int find_exact_renames(struct diff_options *options)
324
{
325
	int i, renames = 0;
326
	struct hashmap file_table;
327

328
	/* Add all sources to the hash table */
329
	hashmap_init(&file_table, NULL, rename_src_nr);
330
	for (i = 0; i < rename_src_nr; i++)
331
		insert_file_table(&file_table, i, rename_src[i].p->one);
332

333
	/* Walk the destinations and find best source match */
334
	for (i = 0; i < rename_dst_nr; i++)
335
		renames += find_identical_files(&file_table, i, options);
336

337 338
	/* Free the hash data structure and entries */
	hashmap_free(&file_table, 1);
339

340
	return renames;
341 342
}

343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358
#define NUM_CANDIDATE_PER_DST 4
static void record_if_better(struct diff_score m[], struct diff_score *o)
{
	int i, worst;

	/* find the worst one */
	worst = 0;
	for (i = 1; i < NUM_CANDIDATE_PER_DST; i++)
		if (score_compare(&m[i], &m[worst]) > 0)
			worst = i;

	/* is it better than the worst one? */
	if (score_compare(&m[worst], o) > 0)
		m[worst] = *o;
}

359 360 361 362 363 364
/*
 * Returns:
 * 0 if we are under the limit;
 * 1 if we need to disable inexact rename detection;
 * 2 if we would be under the limit if we were given -C instead of -C -C.
 */
365 366 367 368 369
static int too_many_rename_candidates(int num_create,
				      struct diff_options *options)
{
	int rename_limit = options->rename_limit;
	int num_src = rename_src_nr;
370
	int i;
371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390

	options->needed_rename_limit = 0;

	/*
	 * This basically does a test for the rename matrix not
	 * growing larger than a "rename_limit" square matrix, ie:
	 *
	 *    num_create * num_src > rename_limit * rename_limit
	 *
	 * but handles the potential overflow case specially (and we
	 * assume at least 32-bit integers)
	 */
	if (rename_limit <= 0 || rename_limit > 32767)
		rename_limit = 32767;
	if ((num_create <= rename_limit || num_src <= rename_limit) &&
	    (num_create * num_src <= rename_limit * rename_limit))
		return 0;

	options->needed_rename_limit =
		num_src > num_create ? num_src : num_create;
391 392 393 394 395 396 397 398 399 400 401 402 403 404

	/* Are we running under -C -C? */
	if (!DIFF_OPT_TST(options, FIND_COPIES_HARDER))
		return 1;

	/* Would we bust the limit if we were running under -C? */
	for (num_src = i = 0; i < rename_src_nr; i++) {
		if (diff_unmodified_pair(rename_src[i].p))
			continue;
		num_src++;
	}
	if ((num_create <= rename_limit || num_src <= rename_limit) &&
	    (num_create * num_src <= rename_limit * rename_limit))
		return 2;
405 406 407
	return 1;
}

408 409 410 411 412 413 414 415 416 417 418 419 420
static int find_renames(struct diff_score *mx, int dst_cnt, int minimum_score, int copies)
{
	int count = 0, i;

	for (i = 0; i < dst_cnt * NUM_CANDIDATE_PER_DST; i++) {
		struct diff_rename_dst *dst;

		if ((mx[i].dst < 0) ||
		    (mx[i].score < minimum_score))
			break; /* there is no more usable pair. */
		dst = &rename_dst[mx[i].dst];
		if (dst->pair)
			continue; /* already done, either exact or fuzzy. */
421
		if (!copies && rename_src[mx[i].src].p->one->rename_used)
422 423 424 425 426 427 428
			continue;
		record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
		count++;
	}
	return count;
}

429
void diffcore_rename(struct diff_options *options)
430
{
431 432
	int detect_rename = options->detect_rename;
	int minimum_score = options->rename_score;
433
	struct diff_queue_struct *q = &diff_queued_diff;
J
Junio C Hamano 已提交
434
	struct diff_queue_struct outq;
435
	struct diff_score *mx;
436
	int i, j, rename_count, skip_unmodified = 0;
437
	int num_create, dst_cnt;
438
	struct progress *progress = NULL;
439

440
	if (!minimum_score)
441
		minimum_score = DEFAULT_RENAME_SCORE;
442 443

	for (i = 0; i < q->nr; i++) {
444
		struct diff_filepair *p = q->queue[i];
445
		if (!DIFF_FILE_VALID(p->one)) {
446
			if (!DIFF_FILE_VALID(p->two))
447
				continue; /* unmerged */
448 449 450
			else if (options->single_follow &&
				 strcmp(options->single_follow, p->two->path))
				continue; /* not interested */
451 452 453
			else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
				 is_empty_blob_sha1(p->two->sha1))
				continue;
454
			else
455
				locate_rename_dst(p->two, 1);
456
		}
457 458 459
		else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
			 is_empty_blob_sha1(p->one->sha1))
			continue;
460
		else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
461 462
			/*
			 * If the source is a broken "delete", and
463 464
			 * they did not really want to get broken,
			 * that means the source actually stays.
465 466 467 468 469
			 * So we increment the "rename_used" score
			 * by one, to indicate ourselves as a user
			 */
			if (p->broken_pair && !p->score)
				p->one->rename_used++;
470
			register_rename_src(p);
471 472 473 474 475
		}
		else if (detect_rename == DIFF_DETECT_COPY) {
			/*
			 * Increment the "rename_used" score by
			 * one, to indicate ourselves as a user.
476
			 */
477
			p->one->rename_used++;
478
			register_rename_src(p);
479
		}
480
	}
481
	if (rename_dst_nr == 0 || rename_src_nr == 0)
482 483
		goto cleanup; /* nothing to do */

484 485 486 487
	/*
	 * We really want to cull the candidates list early
	 * with cheap tests in order to avoid doing deltas.
	 */
488
	rename_count = find_exact_renames(options);
489

490 491 492 493 494 495 496 497 498 499 500 501 502 503
	/* Did we only want exact renames? */
	if (minimum_score == MAX_SCORE)
		goto cleanup;

	/*
	 * Calculate how many renames are left (but all the source
	 * files still remain as options for rename/copies!)
	 */
	num_create = (rename_dst_nr - rename_count);

	/* All done? */
	if (!num_create)
		goto cleanup;

504 505
	switch (too_many_rename_candidates(num_create, options)) {
	case 1:
506
		goto cleanup;
507 508 509 510 511 512 513
	case 2:
		options->degraded_cc_to_c = 1;
		skip_unmodified = 1;
		break;
	default:
		break;
	}
514

515 516
	if (options->show_rename_progress) {
		progress = start_progress_delay(
517
				_("Performing inexact rename detection"),
518 519 520
				rename_dst_nr * rename_src_nr, 50, 1);
	}

521
	mx = xcalloc(num_create * NUM_CANDIDATE_PER_DST, sizeof(*mx));
522 523
	for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
		struct diff_filespec *two = rename_dst[i].two;
524 525
		struct diff_score *m;

526
		if (rename_dst[i].pair)
527
			continue; /* dealt with exact match already. */
528 529 530 531 532

		m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
		for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
			m[j].dst = -1;

533
		for (j = 0; j < rename_src_nr; j++) {
534
			struct diff_filespec *one = rename_src[j].p->one;
535
			struct diff_score this_src;
536 537 538 539 540

			if (skip_unmodified &&
			    diff_unmodified_pair(rename_src[j].p))
				continue;

541 542 543 544 545 546
			this_src.score = estimate_similarity(one, two,
							     minimum_score);
			this_src.name_score = basename_same(one, two);
			this_src.dst = i;
			this_src.src = j;
			record_if_better(m, &this_src);
547 548 549 550
			/*
			 * Once we run estimate_similarity,
			 * We do not need the text anymore.
			 */
551
			diff_free_filespec_blob(one);
552
			diff_free_filespec_blob(two);
553 554
		}
		dst_cnt++;
555
		display_progress(progress, (i+1)*rename_src_nr);
556
	}
557
	stop_progress(&progress);
558

559
	/* cost matrix sorted by most to least similar pair */
560 561
	qsort(mx, dst_cnt * NUM_CANDIDATE_PER_DST, sizeof(*mx), score_compare);

562 563 564
	rename_count += find_renames(mx, dst_cnt, minimum_score, 0);
	if (detect_rename == DIFF_DETECT_COPY)
		rename_count += find_renames(mx, dst_cnt, minimum_score, 1);
565 566
	free(mx);

567
 cleanup:
568
	/* At this point, we have found some renames and copies and they
J
Junio C Hamano 已提交
569
	 * are recorded in rename_dst.  The original list is still in *q.
570
	 */
B
Bo Yang 已提交
571
	DIFF_QUEUE_CLEAR(&outq);
572
	for (i = 0; i < q->nr; i++) {
573 574 575
		struct diff_filepair *p = q->queue[i];
		struct diff_filepair *pair_to_free = NULL;

576 577 578 579
		if (DIFF_PAIR_UNMERGED(p)) {
			diff_q(&outq, p);
		}
		else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
580 581 582 583 584 585 586 587 588
			/*
			 * 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) {
589 590 591 592
				diff_q(&outq, dst->pair);
				pair_to_free = p;
			}
			else
593 594
				/* no matching rename/copy source, so
				 * record this as a creation.
595 596
				 */
				diff_q(&outq, p);
597
		}
598 599 600 601
		else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
			/*
			 * Deletion
			 *
602 603 604 605
			 * 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 已提交
606 607 608
			 * (2) this is not a broken delete, and rename_dst
			 *     does not have a rename/copy to move p->one->path
			 *     out of existence.
609 610 611 612 613
			 *
			 * Otherwise, the counterpart broken create
			 * has been turned into a rename-edit; or
			 * delete did not have a matching create to
			 * begin with.
614
			 */
615 616 617 618 619 620 621 622 623
			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 {
624
				if (p->one->rename_used)
625 626 627
					/* this path remains */
					pair_to_free = p;
			}
628 629 630 631 632 633

			if (pair_to_free)
				;
			else
				diff_q(&outq, p);
		}
634
		else if (!diff_unmodified_pair(p))
635
			/* all the usual ones need to be kept */
636
			diff_q(&outq, p);
637 638 639 640
		else
			/* no need to keep unmodified pairs */
			pair_to_free = p;

641 642
		if (pair_to_free)
			diff_free_filepair(pair_to_free);
643
	}
644
	diff_debug_queue("done copying original", &outq);
645

646 647 648
	free(q->queue);
	*q = outq;
	diff_debug_queue("done collapsing", q);
649

650 651
	for (i = 0; i < rename_dst_nr; i++)
		free_filespec(rename_dst[i].two);
J
Junio C Hamano 已提交
652

653 654 655 656 657 658
	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;
659 660
	return;
}