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