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