1/* 2 * Copyright (C) 2005 Junio C Hamano 3 */ 4#include"cache.h" 5#include"diff.h" 6#include"diffcore.h" 7 8/* Table of rename/copy destinations */ 9 10static struct diff_rename_dst { 11struct diff_filespec *two; 12struct diff_filepair *pair; 13} *rename_dst; 14static int rename_dst_nr, rename_dst_alloc; 15 16static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two, 17int insert_ok) 18{ 19int first, last; 20 21 first =0; 22 last = rename_dst_nr; 23while(last > first) { 24int next = (last + first) >>1; 25struct diff_rename_dst *dst = &(rename_dst[next]); 26int cmp =strcmp(two->path, dst->two->path); 27if(!cmp) 28return dst; 29if(cmp <0) { 30 last = next; 31continue; 32} 33 first = next+1; 34} 35/* not found */ 36if(!insert_ok) 37return NULL; 38/* insert to make it at "first" */ 39if(rename_dst_alloc <= rename_dst_nr) { 40 rename_dst_alloc =alloc_nr(rename_dst_alloc); 41 rename_dst =xrealloc(rename_dst, 42 rename_dst_alloc *sizeof(*rename_dst)); 43} 44 rename_dst_nr++; 45if(first < rename_dst_nr) 46memmove(rename_dst + first +1, rename_dst + first, 47(rename_dst_nr - first -1) *sizeof(*rename_dst)); 48 rename_dst[first].two =alloc_filespec(two->path); 49fill_filespec(rename_dst[first].two, two->sha1, two->mode); 50 rename_dst[first].pair = NULL; 51return&(rename_dst[first]); 52} 53 54/* Table of rename/copy src files */ 55static struct diff_rename_src { 56struct diff_filespec *one; 57unsigned short score;/* to remember the break score */ 58unsigned src_path_left :1; 59} *rename_src; 60static int rename_src_nr, rename_src_alloc; 61 62static struct diff_rename_src *register_rename_src(struct diff_filespec *one, 63int src_path_left, 64unsigned short score) 65{ 66int first, last; 67 68 first =0; 69 last = rename_src_nr; 70while(last > first) { 71int next = (last + first) >>1; 72struct diff_rename_src *src = &(rename_src[next]); 73int cmp =strcmp(one->path, src->one->path); 74if(!cmp) 75return src; 76if(cmp <0) { 77 last = next; 78continue; 79} 80 first = next+1; 81} 82 83/* insert to make it at "first" */ 84if(rename_src_alloc <= rename_src_nr) { 85 rename_src_alloc =alloc_nr(rename_src_alloc); 86 rename_src =xrealloc(rename_src, 87 rename_src_alloc *sizeof(*rename_src)); 88} 89 rename_src_nr++; 90if(first < rename_src_nr) 91memmove(rename_src + first +1, rename_src + first, 92(rename_src_nr - first -1) *sizeof(*rename_src)); 93 rename_src[first].one = one; 94 rename_src[first].score = score; 95 rename_src[first].src_path_left = src_path_left; 96return&(rename_src[first]); 97} 98 99static intis_exact_match(struct diff_filespec *src, 100struct diff_filespec *dst, 101int contents_too) 102{ 103if(src->sha1_valid && dst->sha1_valid && 104!hashcmp(src->sha1, dst->sha1)) 105return1; 106if(!contents_too) 107return0; 108if(diff_populate_filespec(src,1) ||diff_populate_filespec(dst,1)) 109return0; 110if(src->size != dst->size) 111return0; 112if(src->sha1_valid && dst->sha1_valid) 113return!hashcmp(src->sha1, dst->sha1); 114if(diff_populate_filespec(src,0) ||diff_populate_filespec(dst,0)) 115return0; 116if(src->size == dst->size && 117!memcmp(src->data, dst->data, src->size)) 118return1; 119return0; 120} 121 122static intbasename_same(struct diff_filespec *src,struct diff_filespec *dst) 123{ 124int src_len =strlen(src->path), dst_len =strlen(dst->path); 125while(src_len && dst_len) { 126char c1 = src->path[--src_len]; 127char c2 = dst->path[--dst_len]; 128if(c1 != c2) 129return0; 130if(c1 =='/') 131return1; 132} 133return(!src_len || src->path[src_len -1] =='/') && 134(!dst_len || dst->path[dst_len -1] =='/'); 135} 136 137struct diff_score { 138int src;/* index in rename_src */ 139int dst;/* index in rename_dst */ 140int score; 141int name_score; 142}; 143 144static intestimate_similarity(struct diff_filespec *src, 145struct diff_filespec *dst, 146int minimum_score) 147{ 148/* src points at a file that existed in the original tree (or 149 * optionally a file in the destination tree) and dst points 150 * at a newly created file. They may be quite similar, in which 151 * case we want to say src is renamed to dst or src is copied into 152 * dst, and then some edit has been applied to dst. 153 * 154 * Compare them and return how similar they are, representing 155 * the score as an integer between 0 and MAX_SCORE. 156 * 157 * When there is an exact match, it is considered a better 158 * match than anything else; the destination does not even 159 * call into this function in that case. 160 */ 161unsigned long max_size, delta_size, base_size, src_copied, literal_added; 162unsigned long delta_limit; 163int score; 164 165/* We deal only with regular files. Symlink renames are handled 166 * only when they are exact matches --- in other words, no edits 167 * after renaming. 168 */ 169if(!S_ISREG(src->mode) || !S_ISREG(dst->mode)) 170return0; 171 172 max_size = ((src->size > dst->size) ? src->size : dst->size); 173 base_size = ((src->size < dst->size) ? src->size : dst->size); 174 delta_size = max_size - base_size; 175 176/* We would not consider edits that change the file size so 177 * drastically. delta_size must be smaller than 178 * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size). 179 * 180 * Note that base_size == 0 case is handled here already 181 * and the final score computation below would not have a 182 * divide-by-zero issue. 183 */ 184if(base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE) 185return0; 186 187if(diff_populate_filespec(src,0) ||diff_populate_filespec(dst,0)) 188return0;/* error but caught downstream */ 189 190 191 delta_limit = (unsigned long) 192(base_size * (MAX_SCORE-minimum_score) / MAX_SCORE); 193if(diffcore_count_changes(src, dst, 194&src->cnt_data, &dst->cnt_data, 195 delta_limit, 196&src_copied, &literal_added)) 197return0; 198 199/* How similar are they? 200 * what percentage of material in dst are from source? 201 */ 202if(!dst->size) 203 score =0;/* should not happen */ 204else 205 score = (int)(src_copied * MAX_SCORE / max_size); 206return score; 207} 208 209static voidrecord_rename_pair(int dst_index,int src_index,int score) 210{ 211struct diff_filespec *one, *two, *src, *dst; 212struct diff_filepair *dp; 213 214if(rename_dst[dst_index].pair) 215die("internal error: dst already matched."); 216 217 src = rename_src[src_index].one; 218 one =alloc_filespec(src->path); 219fill_filespec(one, src->sha1, src->mode); 220 221 dst = rename_dst[dst_index].two; 222 two =alloc_filespec(dst->path); 223fill_filespec(two, dst->sha1, dst->mode); 224 225 dp =diff_queue(NULL, one, two); 226 dp->renamed_pair =1; 227if(!strcmp(src->path, dst->path)) 228 dp->score = rename_src[src_index].score; 229else 230 dp->score = score; 231 dp->source_stays = rename_src[src_index].src_path_left; 232 rename_dst[dst_index].pair = dp; 233} 234 235/* 236 * We sort the rename similarity matrix with the score, in descending 237 * order (the most similar first). 238 */ 239static intscore_compare(const void*a_,const void*b_) 240{ 241const struct diff_score *a = a_, *b = b_; 242 243if(a->score == b->score) 244return b->name_score - a->name_score; 245 246return b->score - a->score; 247} 248 249static intcompute_stays(struct diff_queue_struct *q, 250struct diff_filespec *one) 251{ 252int i; 253for(i =0; i < q->nr; i++) { 254struct diff_filepair *p = q->queue[i]; 255if(strcmp(one->path, p->two->path)) 256continue; 257if(DIFF_PAIR_RENAME(p)) { 258return0;/* something else is renamed into this */ 259} 260} 261return1; 262} 263 264voiddiffcore_rename(struct diff_options *options) 265{ 266int detect_rename = options->detect_rename; 267int minimum_score = options->rename_score; 268int rename_limit = options->rename_limit; 269struct diff_queue_struct *q = &diff_queued_diff; 270struct diff_queue_struct outq; 271struct diff_score *mx; 272int i, j, rename_count, contents_too; 273int num_create, num_src, dst_cnt; 274 275if(!minimum_score) 276 minimum_score = DEFAULT_RENAME_SCORE; 277 rename_count =0; 278 279for(i =0; i < q->nr; i++) { 280struct diff_filepair *p = q->queue[i]; 281if(!DIFF_FILE_VALID(p->one)) { 282if(!DIFF_FILE_VALID(p->two)) 283continue;/* unmerged */ 284else if(options->single_follow && 285strcmp(options->single_follow, p->two->path)) 286continue;/* not interested */ 287else 288locate_rename_dst(p->two,1); 289} 290else if(!DIFF_FILE_VALID(p->two)) { 291/* If the source is a broken "delete", and 292 * they did not really want to get broken, 293 * that means the source actually stays. 294 */ 295int stays = (p->broken_pair && !p->score); 296register_rename_src(p->one, stays, p->score); 297} 298else if(detect_rename == DIFF_DETECT_COPY) 299register_rename_src(p->one,1, p->score); 300} 301if(rename_dst_nr ==0|| rename_src_nr ==0) 302goto cleanup;/* nothing to do */ 303 304/* 305 * This basically does a test for the rename matrix not 306 * growing larger than a "rename_limit" square matrix, ie: 307 * 308 * rename_dst_nr * rename_src_nr > rename_limit * rename_limit 309 * 310 * but handles the potential overflow case specially (and we 311 * assume at least 32-bit integers) 312 */ 313if(rename_limit <=0|| rename_limit >32767) 314 rename_limit =32767; 315if(rename_dst_nr > rename_limit && rename_src_nr > rename_limit) 316goto cleanup; 317if(rename_dst_nr * rename_src_nr > rename_limit * rename_limit) 318goto cleanup; 319 320/* We really want to cull the candidates list early 321 * with cheap tests in order to avoid doing deltas. 322 * The first round matches up the up-to-date entries, 323 * and then during the second round we try to match 324 * cache-dirty entries as well. 325 */ 326for(contents_too =0; contents_too <2; contents_too++) { 327for(i =0; i < rename_dst_nr; i++) { 328struct diff_filespec *two = rename_dst[i].two; 329if(rename_dst[i].pair) 330continue;/* dealt with an earlier round */ 331for(j =0; j < rename_src_nr; j++) { 332int k; 333struct diff_filespec *one = rename_src[j].one; 334if(!is_exact_match(one, two, contents_too)) 335continue; 336 337/* see if there is a basename match, too */ 338for(k = j; k < rename_src_nr; k++) { 339 one = rename_src[k].one; 340if(basename_same(one, two) && 341is_exact_match(one, two, 342 contents_too)) { 343 j = k; 344break; 345} 346} 347 348record_rename_pair(i, j, (int)MAX_SCORE); 349 rename_count++; 350break;/* we are done with this entry */ 351} 352} 353} 354 355/* Have we run out the created file pool? If so we can avoid 356 * doing the delta matrix altogether. 357 */ 358if(rename_count == rename_dst_nr) 359goto cleanup; 360 361if(minimum_score == MAX_SCORE) 362goto cleanup; 363 364 num_create = (rename_dst_nr - rename_count); 365 num_src = rename_src_nr; 366 mx =xmalloc(sizeof(*mx) * num_create * num_src); 367for(dst_cnt = i =0; i < rename_dst_nr; i++) { 368int base = dst_cnt * num_src; 369struct diff_filespec *two = rename_dst[i].two; 370if(rename_dst[i].pair) 371continue;/* dealt with exact match already. */ 372for(j =0; j < rename_src_nr; j++) { 373struct diff_filespec *one = rename_src[j].one; 374struct diff_score *m = &mx[base+j]; 375 m->src = j; 376 m->dst = i; 377 m->score =estimate_similarity(one, two, 378 minimum_score); 379 m->name_score =basename_same(one, two); 380diff_free_filespec_data(one); 381} 382/* We do not need the text anymore */ 383diff_free_filespec_data(two); 384 dst_cnt++; 385} 386/* cost matrix sorted by most to least similar pair */ 387qsort(mx, num_create * num_src,sizeof(*mx), score_compare); 388for(i =0; i < num_create * num_src; i++) { 389struct diff_rename_dst *dst = &rename_dst[mx[i].dst]; 390if(dst->pair) 391continue;/* already done, either exact or fuzzy. */ 392if(mx[i].score < minimum_score) 393break;/* there is no more usable pair. */ 394record_rename_pair(mx[i].dst, mx[i].src, mx[i].score); 395 rename_count++; 396} 397free(mx); 398 399 cleanup: 400/* At this point, we have found some renames and copies and they 401 * are recorded in rename_dst. The original list is still in *q. 402 */ 403 outq.queue = NULL; 404 outq.nr = outq.alloc =0; 405for(i =0; i < q->nr; i++) { 406struct diff_filepair *p = q->queue[i]; 407struct diff_filepair *pair_to_free = NULL; 408 409if(!DIFF_FILE_VALID(p->one) &&DIFF_FILE_VALID(p->two)) { 410/* 411 * Creation 412 * 413 * We would output this create record if it has 414 * not been turned into a rename/copy already. 415 */ 416struct diff_rename_dst *dst = 417locate_rename_dst(p->two,0); 418if(dst && dst->pair) { 419diff_q(&outq, dst->pair); 420 pair_to_free = p; 421} 422else 423/* no matching rename/copy source, so 424 * record this as a creation. 425 */ 426diff_q(&outq, p); 427} 428else if(DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) { 429/* 430 * Deletion 431 * 432 * We would output this delete record if: 433 * 434 * (1) this is a broken delete and the counterpart 435 * broken create remains in the output; or 436 * (2) this is not a broken delete, and rename_dst 437 * does not have a rename/copy to move p->one->path 438 * out of existence. 439 * 440 * Otherwise, the counterpart broken create 441 * has been turned into a rename-edit; or 442 * delete did not have a matching create to 443 * begin with. 444 */ 445if(DIFF_PAIR_BROKEN(p)) { 446/* broken delete */ 447struct diff_rename_dst *dst = 448locate_rename_dst(p->one,0); 449if(dst && dst->pair) 450/* counterpart is now rename/copy */ 451 pair_to_free = p; 452} 453else{ 454for(j =0; j < rename_dst_nr; j++) { 455if(!rename_dst[j].pair) 456continue; 457if(strcmp(rename_dst[j].pair-> 458 one->path, 459 p->one->path)) 460continue; 461break; 462} 463if(j < rename_dst_nr) 464/* this path remains */ 465 pair_to_free = p; 466} 467 468if(pair_to_free) 469; 470else 471diff_q(&outq, p); 472} 473else if(!diff_unmodified_pair(p)) 474/* all the usual ones need to be kept */ 475diff_q(&outq, p); 476else 477/* no need to keep unmodified pairs */ 478 pair_to_free = p; 479 480if(pair_to_free) 481diff_free_filepair(pair_to_free); 482} 483diff_debug_queue("done copying original", &outq); 484 485free(q->queue); 486*q = outq; 487diff_debug_queue("done collapsing", q); 488 489/* We need to see which rename source really stays here; 490 * earlier we only checked if the path is left in the result, 491 * but even if a path remains in the result, if that is coming 492 * from copying something else on top of it, then the original 493 * source is lost and does not stay. 494 */ 495for(i =0; i < q->nr; i++) { 496struct diff_filepair *p = q->queue[i]; 497if(DIFF_PAIR_RENAME(p) && p->source_stays) { 498/* If one appears as the target of a rename-copy, 499 * then mark p->source_stays = 0; otherwise 500 * leave it as is. 501 */ 502 p->source_stays =compute_stays(q, p->one); 503} 504} 505 506for(i =0; i < rename_dst_nr; i++) { 507diff_free_filespec_data(rename_dst[i].two); 508free(rename_dst[i].two); 509} 510 511free(rename_dst); 512 rename_dst = NULL; 513 rename_dst_nr = rename_dst_alloc =0; 514free(rename_src); 515 rename_src = NULL; 516 rename_src_nr = rename_src_alloc =0; 517return; 518}