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; 141}; 142 143static intestimate_similarity(struct diff_filespec *src, 144struct diff_filespec *dst, 145int minimum_score) 146{ 147/* src points at a file that existed in the original tree (or 148 * optionally a file in the destination tree) and dst points 149 * at a newly created file. They may be quite similar, in which 150 * case we want to say src is renamed to dst or src is copied into 151 * dst, and then some edit has been applied to dst. 152 * 153 * Compare them and return how similar they are, representing 154 * the score as an integer between 0 and MAX_SCORE. 155 * 156 * When there is an exact match, it is considered a better 157 * match than anything else; the destination does not even 158 * call into this function in that case. 159 */ 160unsigned long max_size, delta_size, base_size, src_copied, literal_added; 161unsigned long delta_limit; 162int score; 163 164/* We deal only with regular files. Symlink renames are handled 165 * only when they are exact matches --- in other words, no edits 166 * after renaming. 167 */ 168if(!S_ISREG(src->mode) || !S_ISREG(dst->mode)) 169return0; 170 171 max_size = ((src->size > dst->size) ? src->size : dst->size); 172 base_size = ((src->size < dst->size) ? src->size : dst->size); 173 delta_size = max_size - base_size; 174 175/* We would not consider edits that change the file size so 176 * drastically. delta_size must be smaller than 177 * (MAX_SCORE-minimum_score)/MAX_SCORE * min(src->size, dst->size). 178 * 179 * Note that base_size == 0 case is handled here already 180 * and the final score computation below would not have a 181 * divide-by-zero issue. 182 */ 183if(base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE) 184return0; 185 186if(diff_populate_filespec(src,0) ||diff_populate_filespec(dst,0)) 187return0;/* error but caught downstream */ 188 189 190 delta_limit = (unsigned long) 191(base_size * (MAX_SCORE-minimum_score) / MAX_SCORE); 192if(diffcore_count_changes(src->data, src->size, 193 dst->data, dst->size, 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); 206if(basename_same(src, dst)) 207 score++; 208} 209return score; 210} 211 212static voidrecord_rename_pair(int dst_index,int src_index,int score) 213{ 214struct diff_filespec *one, *two, *src, *dst; 215struct diff_filepair *dp; 216 217if(rename_dst[dst_index].pair) 218die("internal error: dst already matched."); 219 220 src = rename_src[src_index].one; 221 one =alloc_filespec(src->path); 222fill_filespec(one, src->sha1, src->mode); 223 224 dst = rename_dst[dst_index].two; 225 two =alloc_filespec(dst->path); 226fill_filespec(two, dst->sha1, dst->mode); 227 228 dp =diff_queue(NULL, one, two); 229 dp->renamed_pair =1; 230if(!strcmp(src->path, dst->path)) 231 dp->score = rename_src[src_index].score; 232else 233 dp->score = score; 234 dp->source_stays = rename_src[src_index].src_path_left; 235 rename_dst[dst_index].pair = dp; 236} 237 238/* 239 * We sort the rename similarity matrix with the score, in descending 240 * order (the most similar first). 241 */ 242static intscore_compare(const void*a_,const void*b_) 243{ 244const struct diff_score *a = a_, *b = b_; 245return b->score - a->score; 246} 247 248static intcompute_stays(struct diff_queue_struct *q, 249struct diff_filespec *one) 250{ 251int i; 252for(i =0; i < q->nr; i++) { 253struct diff_filepair *p = q->queue[i]; 254if(strcmp(one->path, p->two->path)) 255continue; 256if(DIFF_PAIR_RENAME(p)) { 257return0;/* something else is renamed into this */ 258} 259} 260return1; 261} 262 263voiddiffcore_rename(struct diff_options *options) 264{ 265int detect_rename = options->detect_rename; 266int minimum_score = options->rename_score; 267int rename_limit = options->rename_limit; 268struct diff_queue_struct *q = &diff_queued_diff; 269struct diff_queue_struct outq; 270struct diff_score *mx; 271int i, j, rename_count, contents_too; 272int num_create, num_src, dst_cnt; 273 274if(!minimum_score) 275 minimum_score = DEFAULT_RENAME_SCORE; 276 rename_count =0; 277 278for(i =0; i < q->nr; i++) { 279struct diff_filepair *p = q->queue[i]; 280if(!DIFF_FILE_VALID(p->one)) { 281if(!DIFF_FILE_VALID(p->two)) 282continue;/* unmerged */ 283else if(options->single_follow && 284strcmp(options->single_follow, p->two->path)) 285continue;/* not interested */ 286else 287locate_rename_dst(p->two,1); 288} 289else if(!DIFF_FILE_VALID(p->two)) { 290/* If the source is a broken "delete", and 291 * they did not really want to get broken, 292 * that means the source actually stays. 293 */ 294int stays = (p->broken_pair && !p->score); 295register_rename_src(p->one, stays, p->score); 296} 297else if(detect_rename == DIFF_DETECT_COPY) 298register_rename_src(p->one,1, p->score); 299} 300if(rename_dst_nr ==0|| rename_src_nr ==0|| 301(0< rename_limit && rename_limit < rename_dst_nr)) 302goto cleanup;/* nothing to do */ 303 304/* We really want to cull the candidates list early 305 * with cheap tests in order to avoid doing deltas. 306 * The first round matches up the up-to-date entries, 307 * and then during the second round we try to match 308 * cache-dirty entries as well. 309 */ 310for(contents_too =0; contents_too <2; contents_too++) { 311for(i =0; i < rename_dst_nr; i++) { 312struct diff_filespec *two = rename_dst[i].two; 313if(rename_dst[i].pair) 314continue;/* dealt with an earlier round */ 315for(j =0; j < rename_src_nr; j++) { 316int k; 317struct diff_filespec *one = rename_src[j].one; 318if(!is_exact_match(one, two, contents_too)) 319continue; 320 321/* see if there is a basename match, too */ 322for(k = j; k < rename_src_nr; k++) { 323 one = rename_src[k].one; 324if(basename_same(one, two) && 325is_exact_match(one, two, 326 contents_too)) { 327 j = k; 328break; 329} 330} 331 332record_rename_pair(i, j, (int)MAX_SCORE); 333 rename_count++; 334break;/* we are done with this entry */ 335} 336} 337} 338 339/* Have we run out the created file pool? If so we can avoid 340 * doing the delta matrix altogether. 341 */ 342if(rename_count == rename_dst_nr) 343goto cleanup; 344 345if(minimum_score == MAX_SCORE) 346goto cleanup; 347 348 num_create = (rename_dst_nr - rename_count); 349 num_src = rename_src_nr; 350 mx =xmalloc(sizeof(*mx) * num_create * num_src); 351for(dst_cnt = i =0; i < rename_dst_nr; i++) { 352int base = dst_cnt * num_src; 353struct diff_filespec *two = rename_dst[i].two; 354if(rename_dst[i].pair) 355continue;/* dealt with exact match already. */ 356for(j =0; j < rename_src_nr; j++) { 357struct diff_filespec *one = rename_src[j].one; 358struct diff_score *m = &mx[base+j]; 359 m->src = j; 360 m->dst = i; 361 m->score =estimate_similarity(one, two, 362 minimum_score); 363diff_free_filespec_data(one); 364} 365/* We do not need the text anymore */ 366diff_free_filespec_data(two); 367 dst_cnt++; 368} 369/* cost matrix sorted by most to least similar pair */ 370qsort(mx, num_create * num_src,sizeof(*mx), score_compare); 371for(i =0; i < num_create * num_src; i++) { 372struct diff_rename_dst *dst = &rename_dst[mx[i].dst]; 373if(dst->pair) 374continue;/* already done, either exact or fuzzy. */ 375if(mx[i].score < minimum_score) 376break;/* there is no more usable pair. */ 377record_rename_pair(mx[i].dst, mx[i].src, mx[i].score); 378 rename_count++; 379} 380free(mx); 381 382 cleanup: 383/* At this point, we have found some renames and copies and they 384 * are recorded in rename_dst. The original list is still in *q. 385 */ 386 outq.queue = NULL; 387 outq.nr = outq.alloc =0; 388for(i =0; i < q->nr; i++) { 389struct diff_filepair *p = q->queue[i]; 390struct diff_filepair *pair_to_free = NULL; 391 392if(!DIFF_FILE_VALID(p->one) &&DIFF_FILE_VALID(p->two)) { 393/* 394 * Creation 395 * 396 * We would output this create record if it has 397 * not been turned into a rename/copy already. 398 */ 399struct diff_rename_dst *dst = 400locate_rename_dst(p->two,0); 401if(dst && dst->pair) { 402diff_q(&outq, dst->pair); 403 pair_to_free = p; 404} 405else 406/* no matching rename/copy source, so 407 * record this as a creation. 408 */ 409diff_q(&outq, p); 410} 411else if(DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) { 412/* 413 * Deletion 414 * 415 * We would output this delete record if: 416 * 417 * (1) this is a broken delete and the counterpart 418 * broken create remains in the output; or 419 * (2) this is not a broken delete, and rename_dst 420 * does not have a rename/copy to move p->one->path 421 * out of existence. 422 * 423 * Otherwise, the counterpart broken create 424 * has been turned into a rename-edit; or 425 * delete did not have a matching create to 426 * begin with. 427 */ 428if(DIFF_PAIR_BROKEN(p)) { 429/* broken delete */ 430struct diff_rename_dst *dst = 431locate_rename_dst(p->one,0); 432if(dst && dst->pair) 433/* counterpart is now rename/copy */ 434 pair_to_free = p; 435} 436else{ 437for(j =0; j < rename_dst_nr; j++) { 438if(!rename_dst[j].pair) 439continue; 440if(strcmp(rename_dst[j].pair-> 441 one->path, 442 p->one->path)) 443continue; 444break; 445} 446if(j < rename_dst_nr) 447/* this path remains */ 448 pair_to_free = p; 449} 450 451if(pair_to_free) 452; 453else 454diff_q(&outq, p); 455} 456else if(!diff_unmodified_pair(p)) 457/* all the usual ones need to be kept */ 458diff_q(&outq, p); 459else 460/* no need to keep unmodified pairs */ 461 pair_to_free = p; 462 463if(pair_to_free) 464diff_free_filepair(pair_to_free); 465} 466diff_debug_queue("done copying original", &outq); 467 468free(q->queue); 469*q = outq; 470diff_debug_queue("done collapsing", q); 471 472/* We need to see which rename source really stays here; 473 * earlier we only checked if the path is left in the result, 474 * but even if a path remains in the result, if that is coming 475 * from copying something else on top of it, then the original 476 * source is lost and does not stay. 477 */ 478for(i =0; i < q->nr; i++) { 479struct diff_filepair *p = q->queue[i]; 480if(DIFF_PAIR_RENAME(p) && p->source_stays) { 481/* If one appears as the target of a rename-copy, 482 * then mark p->source_stays = 0; otherwise 483 * leave it as is. 484 */ 485 p->source_stays =compute_stays(q, p->one); 486} 487} 488 489for(i =0; i < rename_dst_nr; i++) { 490diff_free_filespec_data(rename_dst[i].two); 491free(rename_dst[i].two); 492} 493 494free(rename_dst); 495 rename_dst = NULL; 496 rename_dst_nr = rename_dst_alloc =0; 497free(rename_src); 498 rename_src = NULL; 499 rename_src_nr = rename_src_alloc =0; 500return; 501}