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