1/* 2 * Recursive Merge algorithm stolen from git-merge-recursive.py by 3 * Fredrik Kuivinen. 4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006 5 */ 6#include"cache.h" 7#include"config.h" 8#include"advice.h" 9#include"lockfile.h" 10#include"cache-tree.h" 11#include"object-store.h" 12#include"repository.h" 13#include"commit.h" 14#include"blob.h" 15#include"builtin.h" 16#include"tree-walk.h" 17#include"diff.h" 18#include"diffcore.h" 19#include"tag.h" 20#include"alloc.h" 21#include"unpack-trees.h" 22#include"string-list.h" 23#include"xdiff-interface.h" 24#include"ll-merge.h" 25#include"attr.h" 26#include"merge-recursive.h" 27#include"dir.h" 28#include"submodule.h" 29#include"revision.h" 30#include"commit-reach.h" 31 32struct path_hashmap_entry { 33struct hashmap_entry e; 34char path[FLEX_ARRAY]; 35}; 36 37static intpath_hashmap_cmp(const void*cmp_data, 38const void*entry, 39const void*entry_or_key, 40const void*keydata) 41{ 42const struct path_hashmap_entry *a = entry; 43const struct path_hashmap_entry *b = entry_or_key; 44const char*key = keydata; 45 46if(ignore_case) 47returnstrcasecmp(a->path, key ? key : b->path); 48else 49returnstrcmp(a->path, key ? key : b->path); 50} 51 52static unsigned intpath_hash(const char*path) 53{ 54return ignore_case ?strihash(path) :strhash(path); 55} 56 57static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap, 58char*dir) 59{ 60struct dir_rename_entry key; 61 62if(dir == NULL) 63return NULL; 64hashmap_entry_init(&key,strhash(dir)); 65 key.dir = dir; 66returnhashmap_get(hashmap, &key, NULL); 67} 68 69static intdir_rename_cmp(const void*unused_cmp_data, 70const void*entry, 71const void*entry_or_key, 72const void*unused_keydata) 73{ 74const struct dir_rename_entry *e1 = entry; 75const struct dir_rename_entry *e2 = entry_or_key; 76 77returnstrcmp(e1->dir, e2->dir); 78} 79 80static voiddir_rename_init(struct hashmap *map) 81{ 82hashmap_init(map, dir_rename_cmp, NULL,0); 83} 84 85static voiddir_rename_entry_init(struct dir_rename_entry *entry, 86char*directory) 87{ 88hashmap_entry_init(entry,strhash(directory)); 89 entry->dir = directory; 90 entry->non_unique_new_dir =0; 91strbuf_init(&entry->new_dir,0); 92string_list_init(&entry->possible_new_dirs,0); 93} 94 95static struct collision_entry *collision_find_entry(struct hashmap *hashmap, 96char*target_file) 97{ 98struct collision_entry key; 99 100hashmap_entry_init(&key,strhash(target_file)); 101 key.target_file = target_file; 102returnhashmap_get(hashmap, &key, NULL); 103} 104 105static intcollision_cmp(void*unused_cmp_data, 106const struct collision_entry *e1, 107const struct collision_entry *e2, 108const void*unused_keydata) 109{ 110returnstrcmp(e1->target_file, e2->target_file); 111} 112 113static voidcollision_init(struct hashmap *map) 114{ 115hashmap_init(map, (hashmap_cmp_fn) collision_cmp, NULL,0); 116} 117 118static voidflush_output(struct merge_options *o) 119{ 120if(o->buffer_output <2&& o->obuf.len) { 121fputs(o->obuf.buf, stdout); 122strbuf_reset(&o->obuf); 123} 124} 125 126static interr(struct merge_options *o,const char*err, ...) 127{ 128va_list params; 129 130if(o->buffer_output <2) 131flush_output(o); 132else{ 133strbuf_complete(&o->obuf,'\n'); 134strbuf_addstr(&o->obuf,"error: "); 135} 136va_start(params, err); 137strbuf_vaddf(&o->obuf, err, params); 138va_end(params); 139if(o->buffer_output >1) 140strbuf_addch(&o->obuf,'\n'); 141else{ 142error("%s", o->obuf.buf); 143strbuf_reset(&o->obuf); 144} 145 146return-1; 147} 148 149static struct tree *shift_tree_object(struct tree *one,struct tree *two, 150const char*subtree_shift) 151{ 152struct object_id shifted; 153 154if(!*subtree_shift) { 155shift_tree(&one->object.oid, &two->object.oid, &shifted,0); 156}else{ 157shift_tree_by(&one->object.oid, &two->object.oid, &shifted, 158 subtree_shift); 159} 160if(oideq(&two->object.oid, &shifted)) 161return two; 162returnlookup_tree(the_repository, &shifted); 163} 164 165static struct commit *make_virtual_commit(struct tree *tree,const char*comment) 166{ 167struct commit *commit =alloc_commit_node(the_repository); 168 169set_merge_remote_desc(commit, comment, (struct object *)commit); 170 commit->maybe_tree = tree; 171 commit->object.parsed =1; 172return commit; 173} 174 175/* 176 * Since we use get_tree_entry(), which does not put the read object into 177 * the object pool, we cannot rely on a == b. 178 */ 179static intoid_eq(const struct object_id *a,const struct object_id *b) 180{ 181if(!a && !b) 182return2; 183return a && b &&oideq(a, b); 184} 185 186enum rename_type { 187 RENAME_NORMAL =0, 188 RENAME_VIA_DIR, 189 RENAME_ADD, 190 RENAME_DELETE, 191 RENAME_ONE_FILE_TO_ONE, 192 RENAME_ONE_FILE_TO_TWO, 193 RENAME_TWO_FILES_TO_ONE 194}; 195 196struct rename_conflict_info { 197enum rename_type rename_type; 198struct diff_filepair *pair1; 199struct diff_filepair *pair2; 200const char*branch1; 201const char*branch2; 202struct stage_data *dst_entry1; 203struct stage_data *dst_entry2; 204struct diff_filespec ren1_other; 205struct diff_filespec ren2_other; 206}; 207 208/* 209 * Since we want to write the index eventually, we cannot reuse the index 210 * for these (temporary) data. 211 */ 212struct stage_data { 213struct{ 214unsigned mode; 215struct object_id oid; 216} stages[4]; 217struct rename_conflict_info *rename_conflict_info; 218unsigned processed:1; 219}; 220 221staticinlinevoidsetup_rename_conflict_info(enum rename_type rename_type, 222struct diff_filepair *pair1, 223struct diff_filepair *pair2, 224const char*branch1, 225const char*branch2, 226struct stage_data *dst_entry1, 227struct stage_data *dst_entry2, 228struct merge_options *o, 229struct stage_data *src_entry1, 230struct stage_data *src_entry2) 231{ 232int ostage1 =0, ostage2; 233struct rename_conflict_info *ci; 234 235/* 236 * When we have two renames involved, it's easiest to get the 237 * correct things into stage 2 and 3, and to make sure that the 238 * content merge puts HEAD before the other branch if we just 239 * ensure that branch1 == o->branch1. So, simply flip arguments 240 * around if we don't have that. 241 */ 242if(dst_entry2 && branch1 != o->branch1) { 243setup_rename_conflict_info(rename_type, 244 pair2, pair1, 245 branch2, branch1, 246 dst_entry2, dst_entry1, 247 o, 248 src_entry2, src_entry1); 249return; 250} 251 252 ci =xcalloc(1,sizeof(struct rename_conflict_info)); 253 ci->rename_type = rename_type; 254 ci->pair1 = pair1; 255 ci->branch1 = branch1; 256 ci->branch2 = branch2; 257 258 ci->dst_entry1 = dst_entry1; 259 dst_entry1->rename_conflict_info = ci; 260 dst_entry1->processed =0; 261 262assert(!pair2 == !dst_entry2); 263if(dst_entry2) { 264 ci->dst_entry2 = dst_entry2; 265 ci->pair2 = pair2; 266 dst_entry2->rename_conflict_info = ci; 267} 268 269/* 270 * For each rename, there could have been 271 * modifications on the side of history where that 272 * file was not renamed. 273 */ 274if(rename_type == RENAME_ADD || 275 rename_type == RENAME_TWO_FILES_TO_ONE) { 276 ostage1 = o->branch1 == branch1 ?3:2; 277 278 ci->ren1_other.path = pair1->one->path; 279oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid); 280 ci->ren1_other.mode = src_entry1->stages[ostage1].mode; 281} 282 283if(rename_type == RENAME_TWO_FILES_TO_ONE) { 284 ostage2 = ostage1 ^1; 285 286 ci->ren2_other.path = pair2->one->path; 287oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid); 288 ci->ren2_other.mode = src_entry2->stages[ostage2].mode; 289} 290} 291 292static intshow(struct merge_options *o,int v) 293{ 294return(!o->call_depth && o->verbosity >= v) || o->verbosity >=5; 295} 296 297__attribute__((format(printf,3,4))) 298static voidoutput(struct merge_options *o,int v,const char*fmt, ...) 299{ 300va_list ap; 301 302if(!show(o, v)) 303return; 304 305strbuf_addchars(&o->obuf,' ', o->call_depth *2); 306 307va_start(ap, fmt); 308strbuf_vaddf(&o->obuf, fmt, ap); 309va_end(ap); 310 311strbuf_addch(&o->obuf,'\n'); 312if(!o->buffer_output) 313flush_output(o); 314} 315 316static voidoutput_commit_title(struct merge_options *o,struct commit *commit) 317{ 318struct merge_remote_desc *desc; 319 320strbuf_addchars(&o->obuf,' ', o->call_depth *2); 321 desc =merge_remote_util(commit); 322if(desc) 323strbuf_addf(&o->obuf,"virtual%s\n", desc->name); 324else{ 325strbuf_add_unique_abbrev(&o->obuf, &commit->object.oid, 326 DEFAULT_ABBREV); 327strbuf_addch(&o->obuf,' '); 328if(parse_commit(commit) !=0) 329strbuf_addstr(&o->obuf,_("(bad commit)\n")); 330else{ 331const char*title; 332const char*msg =get_commit_buffer(commit, NULL); 333int len =find_commit_subject(msg, &title); 334if(len) 335strbuf_addf(&o->obuf,"%.*s\n", len, title); 336unuse_commit_buffer(commit, msg); 337} 338} 339flush_output(o); 340} 341 342static intadd_cacheinfo(struct merge_options *o, 343unsigned int mode,const struct object_id *oid, 344const char*path,int stage,int refresh,int options) 345{ 346struct cache_entry *ce; 347int ret; 348 349 ce =make_cache_entry(&the_index, mode, oid ? oid : &null_oid, path, stage,0); 350if(!ce) 351returnerr(o,_("add_cacheinfo failed for path '%s'; merge aborting."), path); 352 353 ret =add_cache_entry(ce, options); 354if(refresh) { 355struct cache_entry *nce; 356 357 nce =refresh_cache_entry(&the_index, ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING); 358if(!nce) 359returnerr(o,_("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path); 360if(nce != ce) 361 ret =add_cache_entry(nce, options); 362} 363return ret; 364} 365 366static voidinit_tree_desc_from_tree(struct tree_desc *desc,struct tree *tree) 367{ 368parse_tree(tree); 369init_tree_desc(desc, tree->buffer, tree->size); 370} 371 372static intunpack_trees_start(struct merge_options *o, 373struct tree *common, 374struct tree *head, 375struct tree *merge) 376{ 377int rc; 378struct tree_desc t[3]; 379struct index_state tmp_index = { NULL }; 380 381memset(&o->unpack_opts,0,sizeof(o->unpack_opts)); 382if(o->call_depth) 383 o->unpack_opts.index_only =1; 384else 385 o->unpack_opts.update =1; 386 o->unpack_opts.merge =1; 387 o->unpack_opts.head_idx =2; 388 o->unpack_opts.fn = threeway_merge; 389 o->unpack_opts.src_index = &the_index; 390 o->unpack_opts.dst_index = &tmp_index; 391 o->unpack_opts.aggressive = !merge_detect_rename(o); 392setup_unpack_trees_porcelain(&o->unpack_opts,"merge"); 393 394init_tree_desc_from_tree(t+0, common); 395init_tree_desc_from_tree(t+1, head); 396init_tree_desc_from_tree(t+2, merge); 397 398 rc =unpack_trees(3, t, &o->unpack_opts); 399cache_tree_free(&active_cache_tree); 400 401/* 402 * Update the_index to match the new results, AFTER saving a copy 403 * in o->orig_index. Update src_index to point to the saved copy. 404 * (verify_uptodate() checks src_index, and the original index is 405 * the one that had the necessary modification timestamps.) 406 */ 407 o->orig_index = the_index; 408 the_index = tmp_index; 409 o->unpack_opts.src_index = &o->orig_index; 410 411return rc; 412} 413 414static voidunpack_trees_finish(struct merge_options *o) 415{ 416discard_index(&o->orig_index); 417clear_unpack_trees_porcelain(&o->unpack_opts); 418} 419 420struct tree *write_tree_from_memory(struct merge_options *o) 421{ 422struct tree *result = NULL; 423 424if(unmerged_cache()) { 425int i; 426fprintf(stderr,"BUG: There are unmerged index entries:\n"); 427for(i =0; i < active_nr; i++) { 428const struct cache_entry *ce = active_cache[i]; 429if(ce_stage(ce)) 430fprintf(stderr,"BUG:%d%.*s\n",ce_stage(ce), 431(int)ce_namelen(ce), ce->name); 432} 433BUG("unmerged index entries in merge-recursive.c"); 434} 435 436if(!active_cache_tree) 437 active_cache_tree =cache_tree(); 438 439if(!cache_tree_fully_valid(active_cache_tree) && 440cache_tree_update(&the_index,0) <0) { 441err(o,_("error building trees")); 442return NULL; 443} 444 445 result =lookup_tree(the_repository, &active_cache_tree->oid); 446 447return result; 448} 449 450static intsave_files_dirs(const struct object_id *oid, 451struct strbuf *base,const char*path, 452unsigned int mode,int stage,void*context) 453{ 454struct path_hashmap_entry *entry; 455int baselen = base->len; 456struct merge_options *o = context; 457 458strbuf_addstr(base, path); 459 460FLEX_ALLOC_MEM(entry, path, base->buf, base->len); 461hashmap_entry_init(entry,path_hash(entry->path)); 462hashmap_add(&o->current_file_dir_set, entry); 463 464strbuf_setlen(base, baselen); 465return(S_ISDIR(mode) ? READ_TREE_RECURSIVE :0); 466} 467 468static voidget_files_dirs(struct merge_options *o,struct tree *tree) 469{ 470struct pathspec match_all; 471memset(&match_all,0,sizeof(match_all)); 472read_tree_recursive(tree,"",0,0, &match_all, save_files_dirs, o); 473} 474 475static intget_tree_entry_if_blob(const struct object_id *tree, 476const char*path, 477struct object_id *hashy, 478unsigned int*mode_o) 479{ 480int ret; 481 482 ret =get_tree_entry(tree, path, hashy, mode_o); 483if(S_ISDIR(*mode_o)) { 484oidcpy(hashy, &null_oid); 485*mode_o =0; 486} 487return ret; 488} 489 490/* 491 * Returns an index_entry instance which doesn't have to correspond to 492 * a real cache entry in Git's index. 493 */ 494static struct stage_data *insert_stage_data(const char*path, 495struct tree *o,struct tree *a,struct tree *b, 496struct string_list *entries) 497{ 498struct string_list_item *item; 499struct stage_data *e =xcalloc(1,sizeof(struct stage_data)); 500get_tree_entry_if_blob(&o->object.oid, path, 501&e->stages[1].oid, &e->stages[1].mode); 502get_tree_entry_if_blob(&a->object.oid, path, 503&e->stages[2].oid, &e->stages[2].mode); 504get_tree_entry_if_blob(&b->object.oid, path, 505&e->stages[3].oid, &e->stages[3].mode); 506 item =string_list_insert(entries, path); 507 item->util = e; 508return e; 509} 510 511/* 512 * Create a dictionary mapping file names to stage_data objects. The 513 * dictionary contains one entry for every path with a non-zero stage entry. 514 */ 515static struct string_list *get_unmerged(void) 516{ 517struct string_list *unmerged =xcalloc(1,sizeof(struct string_list)); 518int i; 519 520 unmerged->strdup_strings =1; 521 522for(i =0; i < active_nr; i++) { 523struct string_list_item *item; 524struct stage_data *e; 525const struct cache_entry *ce = active_cache[i]; 526if(!ce_stage(ce)) 527continue; 528 529 item =string_list_lookup(unmerged, ce->name); 530if(!item) { 531 item =string_list_insert(unmerged, ce->name); 532 item->util =xcalloc(1,sizeof(struct stage_data)); 533} 534 e = item->util; 535 e->stages[ce_stage(ce)].mode = ce->ce_mode; 536oidcpy(&e->stages[ce_stage(ce)].oid, &ce->oid); 537} 538 539return unmerged; 540} 541 542static intstring_list_df_name_compare(const char*one,const char*two) 543{ 544int onelen =strlen(one); 545int twolen =strlen(two); 546/* 547 * Here we only care that entries for D/F conflicts are 548 * adjacent, in particular with the file of the D/F conflict 549 * appearing before files below the corresponding directory. 550 * The order of the rest of the list is irrelevant for us. 551 * 552 * To achieve this, we sort with df_name_compare and provide 553 * the mode S_IFDIR so that D/F conflicts will sort correctly. 554 * We use the mode S_IFDIR for everything else for simplicity, 555 * since in other cases any changes in their order due to 556 * sorting cause no problems for us. 557 */ 558int cmp =df_name_compare(one, onelen, S_IFDIR, 559 two, twolen, S_IFDIR); 560/* 561 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure 562 * that 'foo' comes before 'foo/bar'. 563 */ 564if(cmp) 565return cmp; 566return onelen - twolen; 567} 568 569static voidrecord_df_conflict_files(struct merge_options *o, 570struct string_list *entries) 571{ 572/* If there is a D/F conflict and the file for such a conflict 573 * currently exists in the working tree, we want to allow it to be 574 * removed to make room for the corresponding directory if needed. 575 * The files underneath the directories of such D/F conflicts will 576 * be processed before the corresponding file involved in the D/F 577 * conflict. If the D/F directory ends up being removed by the 578 * merge, then we won't have to touch the D/F file. If the D/F 579 * directory needs to be written to the working copy, then the D/F 580 * file will simply be removed (in make_room_for_path()) to make 581 * room for the necessary paths. Note that if both the directory 582 * and the file need to be present, then the D/F file will be 583 * reinstated with a new unique name at the time it is processed. 584 */ 585struct string_list df_sorted_entries = STRING_LIST_INIT_NODUP; 586const char*last_file = NULL; 587int last_len =0; 588int i; 589 590/* 591 * If we're merging merge-bases, we don't want to bother with 592 * any working directory changes. 593 */ 594if(o->call_depth) 595return; 596 597/* Ensure D/F conflicts are adjacent in the entries list. */ 598for(i =0; i < entries->nr; i++) { 599struct string_list_item *next = &entries->items[i]; 600string_list_append(&df_sorted_entries, next->string)->util = 601 next->util; 602} 603 df_sorted_entries.cmp = string_list_df_name_compare; 604string_list_sort(&df_sorted_entries); 605 606string_list_clear(&o->df_conflict_file_set,1); 607for(i =0; i < df_sorted_entries.nr; i++) { 608const char*path = df_sorted_entries.items[i].string; 609int len =strlen(path); 610struct stage_data *e = df_sorted_entries.items[i].util; 611 612/* 613 * Check if last_file & path correspond to a D/F conflict; 614 * i.e. whether path is last_file+'/'+<something>. 615 * If so, record that it's okay to remove last_file to make 616 * room for path and friends if needed. 617 */ 618if(last_file && 619 len > last_len && 620memcmp(path, last_file, last_len) ==0&& 621 path[last_len] =='/') { 622string_list_insert(&o->df_conflict_file_set, last_file); 623} 624 625/* 626 * Determine whether path could exist as a file in the 627 * working directory as a possible D/F conflict. This 628 * will only occur when it exists in stage 2 as a 629 * file. 630 */ 631if(S_ISREG(e->stages[2].mode) ||S_ISLNK(e->stages[2].mode)) { 632 last_file = path; 633 last_len = len; 634}else{ 635 last_file = NULL; 636} 637} 638string_list_clear(&df_sorted_entries,0); 639} 640 641struct rename { 642struct diff_filepair *pair; 643/* 644 * Purpose of src_entry and dst_entry: 645 * 646 * If 'before' is renamed to 'after' then src_entry will contain 647 * the versions of 'before' from the merge_base, HEAD, and MERGE in 648 * stages 1, 2, and 3; dst_entry will contain the respective 649 * versions of 'after' in corresponding locations. Thus, we have a 650 * total of six modes and oids, though some will be null. (Stage 0 651 * is ignored; we're interested in handling conflicts.) 652 * 653 * Since we don't turn on break-rewrites by default, neither 654 * src_entry nor dst_entry can have all three of their stages have 655 * non-null oids, meaning at most four of the six will be non-null. 656 * Also, since this is a rename, both src_entry and dst_entry will 657 * have at least one non-null oid, meaning at least two will be 658 * non-null. Of the six oids, a typical rename will have three be 659 * non-null. Only two implies a rename/delete, and four implies a 660 * rename/add. 661 */ 662struct stage_data *src_entry; 663struct stage_data *dst_entry; 664unsigned add_turned_into_rename:1; 665unsigned processed:1; 666}; 667 668static intupdate_stages(struct merge_options *opt,const char*path, 669const struct diff_filespec *o, 670const struct diff_filespec *a, 671const struct diff_filespec *b) 672{ 673 674/* 675 * NOTE: It is usually a bad idea to call update_stages on a path 676 * before calling update_file on that same path, since it can 677 * sometimes lead to spurious "refusing to lose untracked file..." 678 * messages from update_file (via make_room_for path via 679 * would_lose_untracked). Instead, reverse the order of the calls 680 * (executing update_file first and then update_stages). 681 */ 682int clear =1; 683int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK; 684if(clear) 685if(remove_file_from_cache(path)) 686return-1; 687if(o) 688if(add_cacheinfo(opt, o->mode, &o->oid, path,1,0, options)) 689return-1; 690if(a) 691if(add_cacheinfo(opt, a->mode, &a->oid, path,2,0, options)) 692return-1; 693if(b) 694if(add_cacheinfo(opt, b->mode, &b->oid, path,3,0, options)) 695return-1; 696return0; 697} 698 699static voidupdate_entry(struct stage_data *entry, 700struct diff_filespec *o, 701struct diff_filespec *a, 702struct diff_filespec *b) 703{ 704 entry->processed =0; 705 entry->stages[1].mode = o->mode; 706 entry->stages[2].mode = a->mode; 707 entry->stages[3].mode = b->mode; 708oidcpy(&entry->stages[1].oid, &o->oid); 709oidcpy(&entry->stages[2].oid, &a->oid); 710oidcpy(&entry->stages[3].oid, &b->oid); 711} 712 713static intremove_file(struct merge_options *o,int clean, 714const char*path,int no_wd) 715{ 716int update_cache = o->call_depth || clean; 717int update_working_directory = !o->call_depth && !no_wd; 718 719if(update_cache) { 720if(remove_file_from_cache(path)) 721return-1; 722} 723if(update_working_directory) { 724if(ignore_case) { 725struct cache_entry *ce; 726 ce =cache_file_exists(path,strlen(path), ignore_case); 727if(ce &&ce_stage(ce) ==0&&strcmp(path, ce->name)) 728return0; 729} 730if(remove_path(path)) 731return-1; 732} 733return0; 734} 735 736/* add a string to a strbuf, but converting "/" to "_" */ 737static voidadd_flattened_path(struct strbuf *out,const char*s) 738{ 739size_t i = out->len; 740strbuf_addstr(out, s); 741for(; i < out->len; i++) 742if(out->buf[i] =='/') 743 out->buf[i] ='_'; 744} 745 746static char*unique_path(struct merge_options *o,const char*path,const char*branch) 747{ 748struct path_hashmap_entry *entry; 749struct strbuf newpath = STRBUF_INIT; 750int suffix =0; 751size_t base_len; 752 753strbuf_addf(&newpath,"%s~", path); 754add_flattened_path(&newpath, branch); 755 756 base_len = newpath.len; 757while(hashmap_get_from_hash(&o->current_file_dir_set, 758path_hash(newpath.buf), newpath.buf) || 759(!o->call_depth &&file_exists(newpath.buf))) { 760strbuf_setlen(&newpath, base_len); 761strbuf_addf(&newpath,"_%d", suffix++); 762} 763 764FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len); 765hashmap_entry_init(entry,path_hash(entry->path)); 766hashmap_add(&o->current_file_dir_set, entry); 767returnstrbuf_detach(&newpath, NULL); 768} 769 770/** 771 * Check whether a directory in the index is in the way of an incoming 772 * file. Return 1 if so. If check_working_copy is non-zero, also 773 * check the working directory. If empty_ok is non-zero, also return 774 * 0 in the case where the working-tree dir exists but is empty. 775 */ 776static intdir_in_way(const char*path,int check_working_copy,int empty_ok) 777{ 778int pos; 779struct strbuf dirpath = STRBUF_INIT; 780struct stat st; 781 782strbuf_addstr(&dirpath, path); 783strbuf_addch(&dirpath,'/'); 784 785 pos =cache_name_pos(dirpath.buf, dirpath.len); 786 787if(pos <0) 788 pos = -1- pos; 789if(pos < active_nr && 790!strncmp(dirpath.buf, active_cache[pos]->name, dirpath.len)) { 791strbuf_release(&dirpath); 792return1; 793} 794 795strbuf_release(&dirpath); 796return check_working_copy && !lstat(path, &st) &&S_ISDIR(st.st_mode) && 797!(empty_ok &&is_empty_dir(path)); 798} 799 800/* 801 * Returns whether path was tracked in the index before the merge started, 802 * and its oid and mode match the specified values 803 */ 804static intwas_tracked_and_matches(struct merge_options *o,const char*path, 805const struct object_id *oid,unsigned mode) 806{ 807int pos =index_name_pos(&o->orig_index, path,strlen(path)); 808struct cache_entry *ce; 809 810if(0> pos) 811/* we were not tracking this path before the merge */ 812return0; 813 814/* See if the file we were tracking before matches */ 815 ce = o->orig_index.cache[pos]; 816return(oid_eq(&ce->oid, oid) && ce->ce_mode == mode); 817} 818 819/* 820 * Returns whether path was tracked in the index before the merge started 821 */ 822static intwas_tracked(struct merge_options *o,const char*path) 823{ 824int pos =index_name_pos(&o->orig_index, path,strlen(path)); 825 826if(0<= pos) 827/* we were tracking this path before the merge */ 828return1; 829 830return0; 831} 832 833static intwould_lose_untracked(const char*path) 834{ 835/* 836 * This may look like it can be simplified to: 837 * return !was_tracked(o, path) && file_exists(path) 838 * but it can't. This function needs to know whether path was in 839 * the working tree due to EITHER having been tracked in the index 840 * before the merge OR having been put into the working copy and 841 * index by unpack_trees(). Due to that either-or requirement, we 842 * check the current index instead of the original one. 843 * 844 * Note that we do not need to worry about merge-recursive itself 845 * updating the index after unpack_trees() and before calling this 846 * function, because we strictly require all code paths in 847 * merge-recursive to update the working tree first and the index 848 * second. Doing otherwise would break 849 * update_file()/would_lose_untracked(); see every comment in this 850 * file which mentions "update_stages". 851 */ 852int pos =cache_name_pos(path,strlen(path)); 853 854if(pos <0) 855 pos = -1- pos; 856while(pos < active_nr && 857!strcmp(path, active_cache[pos]->name)) { 858/* 859 * If stage #0, it is definitely tracked. 860 * If it has stage #2 then it was tracked 861 * before this merge started. All other 862 * cases the path was not tracked. 863 */ 864switch(ce_stage(active_cache[pos])) { 865case0: 866case2: 867return0; 868} 869 pos++; 870} 871returnfile_exists(path); 872} 873 874static intwas_dirty(struct merge_options *o,const char*path) 875{ 876struct cache_entry *ce; 877int dirty =1; 878 879if(o->call_depth || !was_tracked(o, path)) 880return!dirty; 881 882 ce =index_file_exists(o->unpack_opts.src_index, 883 path,strlen(path), ignore_case); 884 dirty =verify_uptodate(ce, &o->unpack_opts) !=0; 885return dirty; 886} 887 888static intmake_room_for_path(struct merge_options *o,const char*path) 889{ 890int status, i; 891const char*msg =_("failed to create path '%s'%s"); 892 893/* Unlink any D/F conflict files that are in the way */ 894for(i =0; i < o->df_conflict_file_set.nr; i++) { 895const char*df_path = o->df_conflict_file_set.items[i].string; 896size_t pathlen =strlen(path); 897size_t df_pathlen =strlen(df_path); 898if(df_pathlen < pathlen && 899 path[df_pathlen] =='/'&& 900strncmp(path, df_path, df_pathlen) ==0) { 901output(o,3, 902_("Removing%sto make room for subdirectory\n"), 903 df_path); 904unlink(df_path); 905unsorted_string_list_delete_item(&o->df_conflict_file_set, 906 i,0); 907break; 908} 909} 910 911/* Make sure leading directories are created */ 912 status =safe_create_leading_directories_const(path); 913if(status) { 914if(status == SCLD_EXISTS) 915/* something else exists */ 916returnerr(o, msg, path,_(": perhaps a D/F conflict?")); 917returnerr(o, msg, path,""); 918} 919 920/* 921 * Do not unlink a file in the work tree if we are not 922 * tracking it. 923 */ 924if(would_lose_untracked(path)) 925returnerr(o,_("refusing to lose untracked file at '%s'"), 926 path); 927 928/* Successful unlink is good.. */ 929if(!unlink(path)) 930return0; 931/* .. and so is no existing file */ 932if(errno == ENOENT) 933return0; 934/* .. but not some other error (who really cares what?) */ 935returnerr(o, msg, path,_(": perhaps a D/F conflict?")); 936} 937 938static intupdate_file_flags(struct merge_options *o, 939const struct object_id *oid, 940unsigned mode, 941const char*path, 942int update_cache, 943int update_wd) 944{ 945int ret =0; 946 947if(o->call_depth) 948 update_wd =0; 949 950if(update_wd) { 951enum object_type type; 952void*buf; 953unsigned long size; 954 955if(S_ISGITLINK(mode)) { 956/* 957 * We may later decide to recursively descend into 958 * the submodule directory and update its index 959 * and/or work tree, but we do not do that now. 960 */ 961 update_wd =0; 962goto update_index; 963} 964 965 buf =read_object_file(oid, &type, &size); 966if(!buf) 967returnerr(o,_("cannot read object%s'%s'"),oid_to_hex(oid), path); 968if(type != OBJ_BLOB) { 969 ret =err(o,_("blob expected for%s'%s'"),oid_to_hex(oid), path); 970goto free_buf; 971} 972if(S_ISREG(mode)) { 973struct strbuf strbuf = STRBUF_INIT; 974if(convert_to_working_tree(&the_index, path, buf, size, &strbuf)) { 975free(buf); 976 size = strbuf.len; 977 buf =strbuf_detach(&strbuf, NULL); 978} 979} 980 981if(make_room_for_path(o, path) <0) { 982 update_wd =0; 983goto free_buf; 984} 985if(S_ISREG(mode) || (!has_symlinks &&S_ISLNK(mode))) { 986int fd; 987if(mode &0100) 988 mode =0777; 989else 990 mode =0666; 991 fd =open(path, O_WRONLY | O_TRUNC | O_CREAT, mode); 992if(fd <0) { 993 ret =err(o,_("failed to open '%s':%s"), 994 path,strerror(errno)); 995goto free_buf; 996} 997write_in_full(fd, buf, size); 998close(fd); 999}else if(S_ISLNK(mode)) {1000char*lnk =xmemdupz(buf, size);1001safe_create_leading_directories_const(path);1002unlink(path);1003if(symlink(lnk, path))1004 ret =err(o,_("failed to symlink '%s':%s"),1005 path,strerror(errno));1006free(lnk);1007}else1008 ret =err(o,1009_("do not know what to do with%06o%s'%s'"),1010 mode,oid_to_hex(oid), path);1011 free_buf:1012free(buf);1013}1014update_index:1015if(!ret && update_cache)1016if(add_cacheinfo(o, mode, oid, path,0, update_wd,1017 ADD_CACHE_OK_TO_ADD))1018return-1;1019return ret;1020}10211022static intupdate_file(struct merge_options *o,1023int clean,1024const struct object_id *oid,1025unsigned mode,1026const char*path)1027{1028returnupdate_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth);1029}10301031/* Low level file merging, update and removal */10321033struct merge_file_info {1034struct object_id oid;1035unsigned mode;1036unsigned clean:1,1037 merge:1;1038};10391040static intmerge_3way(struct merge_options *o,1041 mmbuffer_t *result_buf,1042const struct diff_filespec *one,1043const struct diff_filespec *a,1044const struct diff_filespec *b,1045const char*branch1,1046const char*branch2,1047const int extra_marker_size)1048{1049 mmfile_t orig, src1, src2;1050struct ll_merge_options ll_opts = {0};1051char*base_name, *name1, *name2;1052int merge_status;10531054 ll_opts.renormalize = o->renormalize;1055 ll_opts.extra_marker_size = extra_marker_size;1056 ll_opts.xdl_opts = o->xdl_opts;10571058if(o->call_depth) {1059 ll_opts.virtual_ancestor =1;1060 ll_opts.variant =0;1061}else{1062switch(o->recursive_variant) {1063case MERGE_RECURSIVE_OURS:1064 ll_opts.variant = XDL_MERGE_FAVOR_OURS;1065break;1066case MERGE_RECURSIVE_THEIRS:1067 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;1068break;1069default:1070 ll_opts.variant =0;1071break;1072}1073}10741075if(strcmp(a->path, b->path) ||1076(o->ancestor != NULL &&strcmp(a->path, one->path) !=0)) {1077 base_name = o->ancestor == NULL ? NULL :1078mkpathdup("%s:%s", o->ancestor, one->path);1079 name1 =mkpathdup("%s:%s", branch1, a->path);1080 name2 =mkpathdup("%s:%s", branch2, b->path);1081}else{1082 base_name = o->ancestor == NULL ? NULL :1083mkpathdup("%s", o->ancestor);1084 name1 =mkpathdup("%s", branch1);1085 name2 =mkpathdup("%s", branch2);1086}10871088read_mmblob(&orig, &one->oid);1089read_mmblob(&src1, &a->oid);1090read_mmblob(&src2, &b->oid);10911092 merge_status =ll_merge(result_buf, a->path, &orig, base_name,1093&src1, name1, &src2, name2, &ll_opts);10941095free(base_name);1096free(name1);1097free(name2);1098free(orig.ptr);1099free(src1.ptr);1100free(src2.ptr);1101return merge_status;1102}11031104static intfind_first_merges(struct object_array *result,const char*path,1105struct commit *a,struct commit *b)1106{1107int i, j;1108struct object_array merges = OBJECT_ARRAY_INIT;1109struct commit *commit;1110int contains_another;11111112char merged_revision[42];1113const char*rev_args[] = {"rev-list","--merges","--ancestry-path",1114"--all", merged_revision, NULL };1115struct rev_info revs;1116struct setup_revision_opt rev_opts;11171118memset(result,0,sizeof(struct object_array));1119memset(&rev_opts,0,sizeof(rev_opts));11201121/* get all revisions that merge commit a */1122xsnprintf(merged_revision,sizeof(merged_revision),"^%s",1123oid_to_hex(&a->object.oid));1124init_revisions(&revs, NULL);1125 rev_opts.submodule = path;1126/* FIXME: can't handle linked worktrees in submodules yet */1127 revs.single_worktree = path != NULL;1128setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);11291130/* save all revisions from the above list that contain b */1131if(prepare_revision_walk(&revs))1132die("revision walk setup failed");1133while((commit =get_revision(&revs)) != NULL) {1134struct object *o = &(commit->object);1135if(in_merge_bases(b, commit))1136add_object_array(o, NULL, &merges);1137}1138reset_revision_walk();11391140/* Now we've got all merges that contain a and b. Prune all1141 * merges that contain another found merge and save them in1142 * result.1143 */1144for(i =0; i < merges.nr; i++) {1145struct commit *m1 = (struct commit *) merges.objects[i].item;11461147 contains_another =0;1148for(j =0; j < merges.nr; j++) {1149struct commit *m2 = (struct commit *) merges.objects[j].item;1150if(i != j &&in_merge_bases(m2, m1)) {1151 contains_another =1;1152break;1153}1154}11551156if(!contains_another)1157add_object_array(merges.objects[i].item, NULL, result);1158}11591160object_array_clear(&merges);1161return result->nr;1162}11631164static voidprint_commit(struct commit *commit)1165{1166struct strbuf sb = STRBUF_INIT;1167struct pretty_print_context ctx = {0};1168 ctx.date_mode.type = DATE_NORMAL;1169format_commit_message(commit,"%h:%m %s", &sb, &ctx);1170fprintf(stderr,"%s\n", sb.buf);1171strbuf_release(&sb);1172}11731174static intmerge_submodule(struct merge_options *o,1175struct object_id *result,const char*path,1176const struct object_id *base,const struct object_id *a,1177const struct object_id *b)1178{1179struct commit *commit_base, *commit_a, *commit_b;1180int parent_count;1181struct object_array merges;11821183int i;1184int search = !o->call_depth;11851186/* store a in result in case we fail */1187oidcpy(result, a);11881189/* we can not handle deletion conflicts */1190if(is_null_oid(base))1191return0;1192if(is_null_oid(a))1193return0;1194if(is_null_oid(b))1195return0;11961197if(add_submodule_odb(path)) {1198output(o,1,_("Failed to merge submodule%s(not checked out)"), path);1199return0;1200}12011202if(!(commit_base =lookup_commit_reference(the_repository, base)) ||1203!(commit_a =lookup_commit_reference(the_repository, a)) ||1204!(commit_b =lookup_commit_reference(the_repository, b))) {1205output(o,1,_("Failed to merge submodule%s(commits not present)"), path);1206return0;1207}12081209/* check whether both changes are forward */1210if(!in_merge_bases(commit_base, commit_a) ||1211!in_merge_bases(commit_base, commit_b)) {1212output(o,1,_("Failed to merge submodule%s(commits don't follow merge-base)"), path);1213return0;1214}12151216/* Case #1: a is contained in b or vice versa */1217if(in_merge_bases(commit_a, commit_b)) {1218oidcpy(result, b);1219if(show(o,3)) {1220output(o,3,_("Fast-forwarding submodule%sto the following commit:"), path);1221output_commit_title(o, commit_b);1222}else if(show(o,2))1223output(o,2,_("Fast-forwarding submodule%s"), path);1224else1225;/* no output */12261227return1;1228}1229if(in_merge_bases(commit_b, commit_a)) {1230oidcpy(result, a);1231if(show(o,3)) {1232output(o,3,_("Fast-forwarding submodule%sto the following commit:"), path);1233output_commit_title(o, commit_a);1234}else if(show(o,2))1235output(o,2,_("Fast-forwarding submodule%s"), path);1236else1237;/* no output */12381239return1;1240}12411242/*1243 * Case #2: There are one or more merges that contain a and b in1244 * the submodule. If there is only one, then present it as a1245 * suggestion to the user, but leave it marked unmerged so the1246 * user needs to confirm the resolution.1247 */12481249/* Skip the search if makes no sense to the calling context. */1250if(!search)1251return0;12521253/* find commit which merges them */1254 parent_count =find_first_merges(&merges, path, commit_a, commit_b);1255switch(parent_count) {1256case0:1257output(o,1,_("Failed to merge submodule%s(merge following commits not found)"), path);1258break;12591260case1:1261output(o,1,_("Failed to merge submodule%s(not fast-forward)"), path);1262output(o,2,_("Found a possible merge resolution for the submodule:\n"));1263print_commit((struct commit *) merges.objects[0].item);1264output(o,2,_(1265"If this is correct simply add it to the index "1266"for example\n"1267"by using:\n\n"1268" git update-index --cacheinfo 160000%s\"%s\"\n\n"1269"which will accept this suggestion.\n"),1270oid_to_hex(&merges.objects[0].item->oid), path);1271break;12721273default:1274output(o,1,_("Failed to merge submodule%s(multiple merges found)"), path);1275for(i =0; i < merges.nr; i++)1276print_commit((struct commit *) merges.objects[i].item);1277}12781279object_array_clear(&merges);1280return0;1281}12821283static intmerge_mode_and_contents(struct merge_options *o,1284const struct diff_filespec *one,1285const struct diff_filespec *a,1286const struct diff_filespec *b,1287const char*filename,1288const char*branch1,1289const char*branch2,1290const int extra_marker_size,1291struct merge_file_info *result)1292{1293if(o->branch1 != branch1) {1294/*1295 * It's weird getting a reverse merge with HEAD on the bottom1296 * side of the conflict markers and the other branch on the1297 * top. Fix that.1298 */1299returnmerge_mode_and_contents(o, one, b, a,1300 filename,1301 branch2, branch1,1302 extra_marker_size, result);1303}13041305 result->merge =0;1306 result->clean =1;13071308if((S_IFMT & a->mode) != (S_IFMT & b->mode)) {1309 result->clean =0;1310if(S_ISREG(a->mode)) {1311 result->mode = a->mode;1312oidcpy(&result->oid, &a->oid);1313}else{1314 result->mode = b->mode;1315oidcpy(&result->oid, &b->oid);1316}1317}else{1318if(!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid))1319 result->merge =1;13201321/*1322 * Merge modes1323 */1324if(a->mode == b->mode || a->mode == one->mode)1325 result->mode = b->mode;1326else{1327 result->mode = a->mode;1328if(b->mode != one->mode) {1329 result->clean =0;1330 result->merge =1;1331}1332}13331334if(oid_eq(&a->oid, &b->oid) ||oid_eq(&a->oid, &one->oid))1335oidcpy(&result->oid, &b->oid);1336else if(oid_eq(&b->oid, &one->oid))1337oidcpy(&result->oid, &a->oid);1338else if(S_ISREG(a->mode)) {1339 mmbuffer_t result_buf;1340int ret =0, merge_status;13411342 merge_status =merge_3way(o, &result_buf, one, a, b,1343 branch1, branch2,1344 extra_marker_size);13451346if((merge_status <0) || !result_buf.ptr)1347 ret =err(o,_("Failed to execute internal merge"));13481349if(!ret &&1350write_object_file(result_buf.ptr, result_buf.size,1351 blob_type, &result->oid))1352 ret =err(o,_("Unable to add%sto database"),1353 a->path);13541355free(result_buf.ptr);1356if(ret)1357return ret;1358 result->clean = (merge_status ==0);1359}else if(S_ISGITLINK(a->mode)) {1360 result->clean =merge_submodule(o, &result->oid,1361 one->path,1362&one->oid,1363&a->oid,1364&b->oid);1365}else if(S_ISLNK(a->mode)) {1366switch(o->recursive_variant) {1367case MERGE_RECURSIVE_NORMAL:1368oidcpy(&result->oid, &a->oid);1369if(!oid_eq(&a->oid, &b->oid))1370 result->clean =0;1371break;1372case MERGE_RECURSIVE_OURS:1373oidcpy(&result->oid, &a->oid);1374break;1375case MERGE_RECURSIVE_THEIRS:1376oidcpy(&result->oid, &b->oid);1377break;1378}1379}else1380BUG("unsupported object type in the tree");1381}13821383if(result->merge)1384output(o,2,_("Auto-merging%s"), filename);13851386return0;1387}13881389static inthandle_rename_via_dir(struct merge_options *o,1390struct diff_filepair *pair,1391const char*rename_branch,1392const char*other_branch)1393{1394/*1395 * Handle file adds that need to be renamed due to directory rename1396 * detection. This differs from handle_rename_normal, because1397 * there is no content merge to do; just move the file into the1398 * desired final location.1399 */1400const struct diff_filespec *dest = pair->two;14011402if(!o->call_depth &&would_lose_untracked(dest->path)) {1403char*alt_path =unique_path(o, dest->path, rename_branch);14041405output(o,1,_("Error: Refusing to lose untracked file at%s; "1406"writing to%sinstead."),1407 dest->path, alt_path);1408/*1409 * Write the file in worktree at alt_path, but not in the1410 * index. Instead, write to dest->path for the index but1411 * only at the higher appropriate stage.1412 */1413if(update_file(o,0, &dest->oid, dest->mode, alt_path))1414return-1;1415free(alt_path);1416returnupdate_stages(o, dest->path, NULL,1417 rename_branch == o->branch1 ? dest : NULL,1418 rename_branch == o->branch1 ? NULL : dest);1419}14201421/* Update dest->path both in index and in worktree */1422if(update_file(o,1, &dest->oid, dest->mode, dest->path))1423return-1;1424return0;1425}14261427static inthandle_change_delete(struct merge_options *o,1428const char*path,const char*old_path,1429const struct object_id *o_oid,int o_mode,1430const struct object_id *changed_oid,1431int changed_mode,1432const char*change_branch,1433const char*delete_branch,1434const char*change,const char*change_past)1435{1436char*alt_path = NULL;1437const char*update_path = path;1438int ret =0;14391440if(dir_in_way(path, !o->call_depth,0) ||1441(!o->call_depth &&would_lose_untracked(path))) {1442 update_path = alt_path =unique_path(o, path, change_branch);1443}14441445if(o->call_depth) {1446/*1447 * We cannot arbitrarily accept either a_sha or b_sha as1448 * correct; since there is no true "middle point" between1449 * them, simply reuse the base version for virtual merge base.1450 */1451 ret =remove_file_from_cache(path);1452if(!ret)1453 ret =update_file(o,0, o_oid, o_mode, update_path);1454}else{1455/*1456 * Despite the four nearly duplicate messages and argument1457 * lists below and the ugliness of the nested if-statements,1458 * having complete messages makes the job easier for1459 * translators.1460 *1461 * The slight variance among the cases is due to the fact1462 * that:1463 * 1) directory/file conflicts (in effect if1464 * !alt_path) could cause us to need to write the1465 * file to a different path.1466 * 2) renames (in effect if !old_path) could mean that1467 * there are two names for the path that the user1468 * may know the file by.1469 */1470if(!alt_path) {1471if(!old_path) {1472output(o,1,_("CONFLICT (%s/delete):%sdeleted in%s"1473"and%sin%s. Version%sof%sleft in tree."),1474 change, path, delete_branch, change_past,1475 change_branch, change_branch, path);1476}else{1477output(o,1,_("CONFLICT (%s/delete):%sdeleted in%s"1478"and%sto%sin%s. Version%sof%sleft in tree."),1479 change, old_path, delete_branch, change_past, path,1480 change_branch, change_branch, path);1481}1482}else{1483if(!old_path) {1484output(o,1,_("CONFLICT (%s/delete):%sdeleted in%s"1485"and%sin%s. Version%sof%sleft in tree at%s."),1486 change, path, delete_branch, change_past,1487 change_branch, change_branch, path, alt_path);1488}else{1489output(o,1,_("CONFLICT (%s/delete):%sdeleted in%s"1490"and%sto%sin%s. Version%sof%sleft in tree at%s."),1491 change, old_path, delete_branch, change_past, path,1492 change_branch, change_branch, path, alt_path);1493}1494}1495/*1496 * No need to call update_file() on path when change_branch ==1497 * o->branch1 && !alt_path, since that would needlessly touch1498 * path. We could call update_file_flags() with update_cache=01499 * and update_wd=0, but that's a no-op.1500 */1501if(change_branch != o->branch1 || alt_path)1502 ret =update_file(o,0, changed_oid, changed_mode, update_path);1503}1504free(alt_path);15051506return ret;1507}15081509static inthandle_rename_delete(struct merge_options *o,1510struct diff_filepair *pair,1511const char*rename_branch,1512const char*delete_branch)1513{1514const struct diff_filespec *orig = pair->one;1515const struct diff_filespec *dest = pair->two;15161517if(handle_change_delete(o,1518 o->call_depth ? orig->path : dest->path,1519 o->call_depth ? NULL : orig->path,1520&orig->oid, orig->mode,1521&dest->oid, dest->mode,1522 rename_branch, delete_branch,1523_("rename"),_("renamed")))1524return-1;15251526if(o->call_depth)1527returnremove_file_from_cache(dest->path);1528else1529returnupdate_stages(o, dest->path, NULL,1530 rename_branch == o->branch1 ? dest : NULL,1531 rename_branch == o->branch1 ? NULL : dest);1532}15331534static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,1535struct stage_data *entry,1536int stage)1537{1538struct object_id *oid = &entry->stages[stage].oid;1539unsigned mode = entry->stages[stage].mode;1540if(mode ==0||is_null_oid(oid))1541return NULL;1542oidcpy(&target->oid, oid);1543 target->mode = mode;1544return target;1545}15461547static inthandle_file_collision(struct merge_options *o,1548const char*collide_path,1549const char*prev_path1,1550const char*prev_path2,1551const char*branch1,const char*branch2,1552const struct object_id *a_oid,1553unsigned int a_mode,1554const struct object_id *b_oid,1555unsigned int b_mode)1556{1557struct merge_file_info mfi;1558struct diff_filespec null, a, b;1559char*alt_path = NULL;1560const char*update_path = collide_path;15611562/*1563 * It's easiest to get the correct things into stage 2 and 3, and1564 * to make sure that the content merge puts HEAD before the other1565 * branch if we just ensure that branch1 == o->branch1. So, simply1566 * flip arguments around if we don't have that.1567 */1568if(branch1 != o->branch1) {1569returnhandle_file_collision(o, collide_path,1570 prev_path2, prev_path1,1571 branch2, branch1,1572 b_oid, b_mode,1573 a_oid, a_mode);1574}15751576/*1577 * In the recursive case, we just opt to undo renames1578 */1579if(o->call_depth && (prev_path1 || prev_path2)) {1580/* Put first file (a_oid, a_mode) in its original spot */1581if(prev_path1) {1582if(update_file(o,1, a_oid, a_mode, prev_path1))1583return-1;1584}else{1585if(update_file(o,1, a_oid, a_mode, collide_path))1586return-1;1587}15881589/* Put second file (b_oid, b_mode) in its original spot */1590if(prev_path2) {1591if(update_file(o,1, b_oid, b_mode, prev_path2))1592return-1;1593}else{1594if(update_file(o,1, b_oid, b_mode, collide_path))1595return-1;1596}15971598/* Don't leave something at collision path if unrenaming both */1599if(prev_path1 && prev_path2)1600remove_file(o,1, collide_path,0);16011602return0;1603}16041605/* Remove rename sources if rename/add or rename/rename(2to1) */1606if(prev_path1)1607remove_file(o,1, prev_path1,1608 o->call_depth ||would_lose_untracked(prev_path1));1609if(prev_path2)1610remove_file(o,1, prev_path2,1611 o->call_depth ||would_lose_untracked(prev_path2));16121613/*1614 * Remove the collision path, if it wouldn't cause dirty contents1615 * or an untracked file to get lost. We'll either overwrite with1616 * merged contents, or just write out to differently named files.1617 */1618if(was_dirty(o, collide_path)) {1619output(o,1,_("Refusing to lose dirty file at%s"),1620 collide_path);1621 update_path = alt_path =unique_path(o, collide_path,"merged");1622}else if(would_lose_untracked(collide_path)) {1623/*1624 * Only way we get here is if both renames were from1625 * a directory rename AND user had an untracked file1626 * at the location where both files end up after the1627 * two directory renames. See testcase 10d of t6043.1628 */1629output(o,1,_("Refusing to lose untracked file at "1630"%s, even though it's in the way."),1631 collide_path);1632 update_path = alt_path =unique_path(o, collide_path,"merged");1633}else{1634/*1635 * FIXME: It's possible that the two files are identical1636 * and that the current working copy happens to match, in1637 * which case we are unnecessarily touching the working1638 * tree file. It's not a likely enough scenario that I1639 * want to code up the checks for it and a better fix is1640 * available if we restructure how unpack_trees() and1641 * merge-recursive interoperate anyway, so punting for1642 * now...1643 */1644remove_file(o,0, collide_path,0);1645}16461647/* Store things in diff_filespecs for functions that need it */1648memset(&a,0,sizeof(struct diff_filespec));1649memset(&b,0,sizeof(struct diff_filespec));1650 null.path = a.path = b.path = (char*)collide_path;1651oidcpy(&null.oid, &null_oid);1652 null.mode =0;1653oidcpy(&a.oid, a_oid);1654 a.mode = a_mode;1655 a.oid_valid =1;1656oidcpy(&b.oid, b_oid);1657 b.mode = b_mode;1658 b.oid_valid =1;16591660if(merge_mode_and_contents(o, &null, &a, &b, collide_path,1661 branch1, branch2, o->call_depth *2, &mfi))1662return-1;1663 mfi.clean &= !alt_path;1664if(update_file(o, mfi.clean, &mfi.oid, mfi.mode, update_path))1665return-1;1666if(!mfi.clean && !o->call_depth &&1667update_stages(o, collide_path, NULL, &a, &b))1668return-1;1669free(alt_path);1670/*1671 * FIXME: If both a & b both started with conflicts (only possible1672 * if they came from a rename/rename(2to1)), but had IDENTICAL1673 * contents including those conflicts, then in the next line we claim1674 * it was clean. If someone cares about this case, we should have the1675 * caller notify us if we started with conflicts.1676 */1677return mfi.clean;1678}16791680static inthandle_rename_add(struct merge_options *o,1681struct rename_conflict_info *ci)1682{1683/* a was renamed to c, and a separate c was added. */1684struct diff_filespec *a = ci->pair1->one;1685struct diff_filespec *c = ci->pair1->two;1686char*path = c->path;1687char*prev_path_desc;1688struct merge_file_info mfi;16891690int other_stage = (ci->branch1 == o->branch1 ?3:2);16911692output(o,1,_("CONFLICT (rename/add): "1693"Rename%s->%sin%s. Added%sin%s"),1694 a->path, c->path, ci->branch1,1695 c->path, ci->branch2);16961697 prev_path_desc =xstrfmt("version of%sfrom%s", path, a->path);1698if(merge_mode_and_contents(o, a, c, &ci->ren1_other, prev_path_desc,1699 o->branch1, o->branch2,17001+ o->call_depth *2, &mfi))1701return-1;1702free(prev_path_desc);17031704returnhandle_file_collision(o,1705 c->path, a->path, NULL,1706 ci->branch1, ci->branch2,1707&mfi.oid, mfi.mode,1708&ci->dst_entry1->stages[other_stage].oid,1709 ci->dst_entry1->stages[other_stage].mode);1710}17111712static inthandle_file(struct merge_options *o,1713struct diff_filespec *rename,1714int stage,1715struct rename_conflict_info *ci)1716{1717char*dst_name = rename->path;1718struct stage_data *dst_entry;1719const char*cur_branch, *other_branch;1720struct diff_filespec other;1721struct diff_filespec *add;1722int ret;17231724if(stage ==2) {1725 dst_entry = ci->dst_entry1;1726 cur_branch = ci->branch1;1727 other_branch = ci->branch2;1728}else{1729 dst_entry = ci->dst_entry2;1730 cur_branch = ci->branch2;1731 other_branch = ci->branch1;1732}17331734 add =filespec_from_entry(&other, dst_entry, stage ^1);1735if(add) {1736int ren_src_was_dirty =was_dirty(o, rename->path);1737char*add_name =unique_path(o, rename->path, other_branch);1738if(update_file(o,0, &add->oid, add->mode, add_name))1739return-1;17401741if(ren_src_was_dirty) {1742output(o,1,_("Refusing to lose dirty file at%s"),1743 rename->path);1744}1745/*1746 * Because the double negatives somehow keep confusing me...1747 * 1) update_wd iff !ren_src_was_dirty.1748 * 2) no_wd iff !update_wd1749 * 3) so, no_wd == !!ren_src_was_dirty == ren_src_was_dirty1750 */1751remove_file(o,0, rename->path, ren_src_was_dirty);1752 dst_name =unique_path(o, rename->path, cur_branch);1753}else{1754if(dir_in_way(rename->path, !o->call_depth,0)) {1755 dst_name =unique_path(o, rename->path, cur_branch);1756output(o,1,_("%sis a directory in%sadding as%sinstead"),1757 rename->path, other_branch, dst_name);1758}else if(!o->call_depth &&1759would_lose_untracked(rename->path)) {1760 dst_name =unique_path(o, rename->path, cur_branch);1761output(o,1,_("Refusing to lose untracked file at%s; "1762"adding as%sinstead"),1763 rename->path, dst_name);1764}1765}1766if((ret =update_file(o,0, &rename->oid, rename->mode, dst_name)))1767;/* fall through, do allow dst_name to be released */1768else if(stage ==2)1769 ret =update_stages(o, rename->path, NULL, rename, add);1770else1771 ret =update_stages(o, rename->path, NULL, add, rename);17721773if(dst_name != rename->path)1774free(dst_name);17751776return ret;1777}17781779static inthandle_rename_rename_1to2(struct merge_options *o,1780struct rename_conflict_info *ci)1781{1782/* One file was renamed in both branches, but to different names. */1783struct diff_filespec *one = ci->pair1->one;1784struct diff_filespec *a = ci->pair1->two;1785struct diff_filespec *b = ci->pair2->two;17861787output(o,1,_("CONFLICT (rename/rename): "1788"Rename\"%s\"->\"%s\"in branch\"%s\""1789"rename\"%s\"->\"%s\"in\"%s\"%s"),1790 one->path, a->path, ci->branch1,1791 one->path, b->path, ci->branch2,1792 o->call_depth ?_(" (left unresolved)") :"");1793if(o->call_depth) {1794struct merge_file_info mfi;1795struct diff_filespec other;1796struct diff_filespec *add;1797if(merge_mode_and_contents(o, one, a, b, one->path,1798 ci->branch1, ci->branch2,1799 o->call_depth *2, &mfi))1800return-1;18011802/*1803 * FIXME: For rename/add-source conflicts (if we could detect1804 * such), this is wrong. We should instead find a unique1805 * pathname and then either rename the add-source file to that1806 * unique path, or use that unique path instead of src here.1807 */1808if(update_file(o,0, &mfi.oid, mfi.mode, one->path))1809return-1;18101811/*1812 * Above, we put the merged content at the merge-base's1813 * path. Now we usually need to delete both a->path and1814 * b->path. However, the rename on each side of the merge1815 * could also be involved in a rename/add conflict. In1816 * such cases, we should keep the added file around,1817 * resolving the conflict at that path in its favor.1818 */1819 add =filespec_from_entry(&other, ci->dst_entry1,2^1);1820if(add) {1821if(update_file(o,0, &add->oid, add->mode, a->path))1822return-1;1823}1824else1825remove_file_from_cache(a->path);1826 add =filespec_from_entry(&other, ci->dst_entry2,3^1);1827if(add) {1828if(update_file(o,0, &add->oid, add->mode, b->path))1829return-1;1830}1831else1832remove_file_from_cache(b->path);1833}else if(handle_file(o, a,2, ci) ||handle_file(o, b,3, ci))1834return-1;18351836return0;1837}18381839static inthandle_rename_rename_2to1(struct merge_options *o,1840struct rename_conflict_info *ci)1841{1842/* Two files, a & b, were renamed to the same thing, c. */1843struct diff_filespec *a = ci->pair1->one;1844struct diff_filespec *b = ci->pair2->one;1845struct diff_filespec *c1 = ci->pair1->two;1846struct diff_filespec *c2 = ci->pair2->two;1847char*path = c1->path;/* == c2->path */1848char*path_side_1_desc;1849char*path_side_2_desc;1850struct merge_file_info mfi_c1;1851struct merge_file_info mfi_c2;18521853output(o,1,_("CONFLICT (rename/rename): "1854"Rename%s->%sin%s. "1855"Rename%s->%sin%s"),1856 a->path, c1->path, ci->branch1,1857 b->path, c2->path, ci->branch2);18581859 path_side_1_desc =xstrfmt("version of%sfrom%s", path, a->path);1860 path_side_2_desc =xstrfmt("version of%sfrom%s", path, b->path);1861if(merge_mode_and_contents(o, a, c1, &ci->ren1_other, path_side_1_desc,1862 o->branch1, o->branch2,18631+ o->call_depth *2, &mfi_c1) ||1864merge_mode_and_contents(o, b, &ci->ren2_other, c2, path_side_2_desc,1865 o->branch1, o->branch2,18661+ o->call_depth *2, &mfi_c2))1867return-1;1868free(path_side_1_desc);1869free(path_side_2_desc);18701871returnhandle_file_collision(o, path, a->path, b->path,1872 ci->branch1, ci->branch2,1873&mfi_c1.oid, mfi_c1.mode,1874&mfi_c2.oid, mfi_c2.mode);1875}18761877/*1878 * Get the diff_filepairs changed between o_tree and tree.1879 */1880static struct diff_queue_struct *get_diffpairs(struct merge_options *o,1881struct tree *o_tree,1882struct tree *tree)1883{1884struct diff_queue_struct *ret;1885struct diff_options opts;18861887diff_setup(&opts);1888 opts.flags.recursive =1;1889 opts.flags.rename_empty =0;1890 opts.detect_rename =merge_detect_rename(o);1891/*1892 * We do not have logic to handle the detection of copies. In1893 * fact, it may not even make sense to add such logic: would we1894 * really want a change to a base file to be propagated through1895 * multiple other files by a merge?1896 */1897if(opts.detect_rename > DIFF_DETECT_RENAME)1898 opts.detect_rename = DIFF_DETECT_RENAME;1899 opts.rename_limit = o->merge_rename_limit >=0? o->merge_rename_limit :1900 o->diff_rename_limit >=0? o->diff_rename_limit :19011000;1902 opts.rename_score = o->rename_score;1903 opts.show_rename_progress = o->show_rename_progress;1904 opts.output_format = DIFF_FORMAT_NO_OUTPUT;1905diff_setup_done(&opts);1906diff_tree_oid(&o_tree->object.oid, &tree->object.oid,"", &opts);1907diffcore_std(&opts);1908if(opts.needed_rename_limit > o->needed_rename_limit)1909 o->needed_rename_limit = opts.needed_rename_limit;19101911 ret =xmalloc(sizeof(*ret));1912*ret = diff_queued_diff;19131914 opts.output_format = DIFF_FORMAT_NO_OUTPUT;1915 diff_queued_diff.nr =0;1916 diff_queued_diff.queue = NULL;1917diff_flush(&opts);1918return ret;1919}19201921static inttree_has_path(struct tree *tree,const char*path)1922{1923struct object_id hashy;1924unsigned int mode_o;19251926return!get_tree_entry(&tree->object.oid, path,1927&hashy, &mode_o);1928}19291930/*1931 * Return a new string that replaces the beginning portion (which matches1932 * entry->dir), with entry->new_dir. In perl-speak:1933 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);1934 * NOTE:1935 * Caller must ensure that old_path starts with entry->dir + '/'.1936 */1937static char*apply_dir_rename(struct dir_rename_entry *entry,1938const char*old_path)1939{1940struct strbuf new_path = STRBUF_INIT;1941int oldlen, newlen;19421943if(entry->non_unique_new_dir)1944return NULL;19451946 oldlen =strlen(entry->dir);1947 newlen = entry->new_dir.len + (strlen(old_path) - oldlen) +1;1948strbuf_grow(&new_path, newlen);1949strbuf_addbuf(&new_path, &entry->new_dir);1950strbuf_addstr(&new_path, &old_path[oldlen]);19511952returnstrbuf_detach(&new_path, NULL);1953}19541955static voidget_renamed_dir_portion(const char*old_path,const char*new_path,1956char**old_dir,char**new_dir)1957{1958char*end_of_old, *end_of_new;1959int old_len, new_len;19601961*old_dir = NULL;1962*new_dir = NULL;19631964/*1965 * For1966 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"1967 * the "e/foo.c" part is the same, we just want to know that1968 * "a/b/c/d" was renamed to "a/b/some/thing/else"1969 * so, for this example, this function returns "a/b/c/d" in1970 * *old_dir and "a/b/some/thing/else" in *new_dir.1971 *1972 * Also, if the basename of the file changed, we don't care. We1973 * want to know which portion of the directory, if any, changed.1974 */1975 end_of_old =strrchr(old_path,'/');1976 end_of_new =strrchr(new_path,'/');19771978if(end_of_old == NULL || end_of_new == NULL)1979return;1980while(*--end_of_new == *--end_of_old &&1981 end_of_old != old_path &&1982 end_of_new != new_path)1983;/* Do nothing; all in the while loop */1984/*1985 * We've found the first non-matching character in the directory1986 * paths. That means the current directory we were comparing1987 * represents the rename. Move end_of_old and end_of_new back1988 * to the full directory name.1989 */1990if(*end_of_old =='/')1991 end_of_old++;1992if(*end_of_old !='/')1993 end_of_new++;1994 end_of_old =strchr(end_of_old,'/');1995 end_of_new =strchr(end_of_new,'/');19961997/*1998 * It may have been the case that old_path and new_path were the same1999 * directory all along. Don't claim a rename if they're the same.2000 */2001 old_len = end_of_old - old_path;2002 new_len = end_of_new - new_path;20032004if(old_len != new_len ||strncmp(old_path, new_path, old_len)) {2005*old_dir =xstrndup(old_path, old_len);2006*new_dir =xstrndup(new_path, new_len);2007}2008}20092010static voidremove_hashmap_entries(struct hashmap *dir_renames,2011struct string_list *items_to_remove)2012{2013int i;2014struct dir_rename_entry *entry;20152016for(i =0; i < items_to_remove->nr; i++) {2017 entry = items_to_remove->items[i].util;2018hashmap_remove(dir_renames, entry, NULL);2019}2020string_list_clear(items_to_remove,0);2021}20222023/*2024 * See if there is a directory rename for path, and if there are any file2025 * level conflicts for the renamed location. If there is a rename and2026 * there are no conflicts, return the new name. Otherwise, return NULL.2027 */2028static char*handle_path_level_conflicts(struct merge_options *o,2029const char*path,2030struct dir_rename_entry *entry,2031struct hashmap *collisions,2032struct tree *tree)2033{2034char*new_path = NULL;2035struct collision_entry *collision_ent;2036int clean =1;2037struct strbuf collision_paths = STRBUF_INIT;20382039/*2040 * entry has the mapping of old directory name to new directory name2041 * that we want to apply to path.2042 */2043 new_path =apply_dir_rename(entry, path);20442045if(!new_path) {2046/* This should only happen when entry->non_unique_new_dir set */2047if(!entry->non_unique_new_dir)2048BUG("entry->non_unqiue_dir not set and !new_path");2049output(o,1,_("CONFLICT (directory rename split): "2050"Unclear where to place%sbecause directory "2051"%swas renamed to multiple other directories, "2052"with no destination getting a majority of the "2053"files."),2054 path, entry->dir);2055 clean =0;2056return NULL;2057}20582059/*2060 * The caller needs to have ensured that it has pre-populated2061 * collisions with all paths that map to new_path. Do a quick check2062 * to ensure that's the case.2063 */2064 collision_ent =collision_find_entry(collisions, new_path);2065if(collision_ent == NULL)2066BUG("collision_ent is NULL");20672068/*2069 * Check for one-sided add/add/.../add conflicts, i.e.2070 * where implicit renames from the other side doing2071 * directory rename(s) can affect this side of history2072 * to put multiple paths into the same location. Warn2073 * and bail on directory renames for such paths.2074 */2075if(collision_ent->reported_already) {2076 clean =0;2077}else if(tree_has_path(tree, new_path)) {2078 collision_ent->reported_already =1;2079strbuf_add_separated_string_list(&collision_paths,", ",2080&collision_ent->source_files);2081output(o,1,_("CONFLICT (implicit dir rename): Existing "2082"file/dir at%sin the way of implicit "2083"directory rename(s) putting the following "2084"path(s) there:%s."),2085 new_path, collision_paths.buf);2086 clean =0;2087}else if(collision_ent->source_files.nr >1) {2088 collision_ent->reported_already =1;2089strbuf_add_separated_string_list(&collision_paths,", ",2090&collision_ent->source_files);2091output(o,1,_("CONFLICT (implicit dir rename): Cannot map "2092"more than one path to%s; implicit directory "2093"renames tried to put these paths there:%s"),2094 new_path, collision_paths.buf);2095 clean =0;2096}20972098/* Free memory we no longer need */2099strbuf_release(&collision_paths);2100if(!clean && new_path) {2101free(new_path);2102return NULL;2103}21042105return new_path;2106}21072108/*2109 * There are a couple things we want to do at the directory level:2110 * 1. Check for both sides renaming to the same thing, in order to avoid2111 * implicit renaming of files that should be left in place. (See2112 * testcase 6b in t6043 for details.)2113 * 2. Prune directory renames if there are still files left in the2114 * the original directory. These represent a partial directory rename,2115 * i.e. a rename where only some of the files within the directory2116 * were renamed elsewhere. (Technically, this could be done earlier2117 * in get_directory_renames(), except that would prevent us from2118 * doing the previous check and thus failing testcase 6b.)2119 * 3. Check for rename/rename(1to2) conflicts (at the directory level).2120 * In the future, we could potentially record this info as well and2121 * omit reporting rename/rename(1to2) conflicts for each path within2122 * the affected directories, thus cleaning up the merge output.2123 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the2124 * directory level, because merging directories is fine. If it2125 * causes conflicts for files within those merged directories, then2126 * that should be detected at the individual path level.2127 */2128static voidhandle_directory_level_conflicts(struct merge_options *o,2129struct hashmap *dir_re_head,2130struct tree *head,2131struct hashmap *dir_re_merge,2132struct tree *merge)2133{2134struct hashmap_iter iter;2135struct dir_rename_entry *head_ent;2136struct dir_rename_entry *merge_ent;21372138struct string_list remove_from_head = STRING_LIST_INIT_NODUP;2139struct string_list remove_from_merge = STRING_LIST_INIT_NODUP;21402141hashmap_iter_init(dir_re_head, &iter);2142while((head_ent =hashmap_iter_next(&iter))) {2143 merge_ent =dir_rename_find_entry(dir_re_merge, head_ent->dir);2144if(merge_ent &&2145!head_ent->non_unique_new_dir &&2146!merge_ent->non_unique_new_dir &&2147!strbuf_cmp(&head_ent->new_dir, &merge_ent->new_dir)) {2148/* 1. Renamed identically; remove it from both sides */2149string_list_append(&remove_from_head,2150 head_ent->dir)->util = head_ent;2151strbuf_release(&head_ent->new_dir);2152string_list_append(&remove_from_merge,2153 merge_ent->dir)->util = merge_ent;2154strbuf_release(&merge_ent->new_dir);2155}else if(tree_has_path(head, head_ent->dir)) {2156/* 2. This wasn't a directory rename after all */2157string_list_append(&remove_from_head,2158 head_ent->dir)->util = head_ent;2159strbuf_release(&head_ent->new_dir);2160}2161}21622163remove_hashmap_entries(dir_re_head, &remove_from_head);2164remove_hashmap_entries(dir_re_merge, &remove_from_merge);21652166hashmap_iter_init(dir_re_merge, &iter);2167while((merge_ent =hashmap_iter_next(&iter))) {2168 head_ent =dir_rename_find_entry(dir_re_head, merge_ent->dir);2169if(tree_has_path(merge, merge_ent->dir)) {2170/* 2. This wasn't a directory rename after all */2171string_list_append(&remove_from_merge,2172 merge_ent->dir)->util = merge_ent;2173}else if(head_ent &&2174!head_ent->non_unique_new_dir &&2175!merge_ent->non_unique_new_dir) {2176/* 3. rename/rename(1to2) */2177/*2178 * We can assume it's not rename/rename(1to1) because2179 * that was case (1), already checked above. So we2180 * know that head_ent->new_dir and merge_ent->new_dir2181 * are different strings.2182 */2183output(o,1,_("CONFLICT (rename/rename): "2184"Rename directory%s->%sin%s. "2185"Rename directory%s->%sin%s"),2186 head_ent->dir, head_ent->new_dir.buf, o->branch1,2187 head_ent->dir, merge_ent->new_dir.buf, o->branch2);2188string_list_append(&remove_from_head,2189 head_ent->dir)->util = head_ent;2190strbuf_release(&head_ent->new_dir);2191string_list_append(&remove_from_merge,2192 merge_ent->dir)->util = merge_ent;2193strbuf_release(&merge_ent->new_dir);2194}2195}21962197remove_hashmap_entries(dir_re_head, &remove_from_head);2198remove_hashmap_entries(dir_re_merge, &remove_from_merge);2199}22002201static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs,2202struct tree *tree)2203{2204struct hashmap *dir_renames;2205struct hashmap_iter iter;2206struct dir_rename_entry *entry;2207int i;22082209/*2210 * Typically, we think of a directory rename as all files from a2211 * certain directory being moved to a target directory. However,2212 * what if someone first moved two files from the original2213 * directory in one commit, and then renamed the directory2214 * somewhere else in a later commit? At merge time, we just know2215 * that files from the original directory went to two different2216 * places, and that the bulk of them ended up in the same place.2217 * We want each directory rename to represent where the bulk of the2218 * files from that directory end up; this function exists to find2219 * where the bulk of the files went.2220 *2221 * The first loop below simply iterates through the list of file2222 * renames, finding out how often each directory rename pair2223 * possibility occurs.2224 */2225 dir_renames =xmalloc(sizeof(*dir_renames));2226dir_rename_init(dir_renames);2227for(i =0; i < pairs->nr; ++i) {2228struct string_list_item *item;2229int*count;2230struct diff_filepair *pair = pairs->queue[i];2231char*old_dir, *new_dir;22322233/* File not part of directory rename if it wasn't renamed */2234if(pair->status !='R')2235continue;22362237get_renamed_dir_portion(pair->one->path, pair->two->path,2238&old_dir, &new_dir);2239if(!old_dir)2240/* Directory didn't change at all; ignore this one. */2241continue;22422243 entry =dir_rename_find_entry(dir_renames, old_dir);2244if(!entry) {2245 entry =xmalloc(sizeof(*entry));2246dir_rename_entry_init(entry, old_dir);2247hashmap_put(dir_renames, entry);2248}else{2249free(old_dir);2250}2251 item =string_list_lookup(&entry->possible_new_dirs, new_dir);2252if(!item) {2253 item =string_list_insert(&entry->possible_new_dirs,2254 new_dir);2255 item->util =xcalloc(1,sizeof(int));2256}else{2257free(new_dir);2258}2259 count = item->util;2260*count +=1;2261}22622263/*2264 * For each directory with files moved out of it, we find out which2265 * target directory received the most files so we can declare it to2266 * be the "winning" target location for the directory rename. This2267 * winner gets recorded in new_dir. If there is no winner2268 * (multiple target directories received the same number of files),2269 * we set non_unique_new_dir. Once we've determined the winner (or2270 * that there is no winner), we no longer need possible_new_dirs.2271 */2272hashmap_iter_init(dir_renames, &iter);2273while((entry =hashmap_iter_next(&iter))) {2274int max =0;2275int bad_max =0;2276char*best = NULL;22772278for(i =0; i < entry->possible_new_dirs.nr; i++) {2279int*count = entry->possible_new_dirs.items[i].util;22802281if(*count == max)2282 bad_max = max;2283else if(*count > max) {2284 max = *count;2285 best = entry->possible_new_dirs.items[i].string;2286}2287}2288if(bad_max == max)2289 entry->non_unique_new_dir =1;2290else{2291assert(entry->new_dir.len ==0);2292strbuf_addstr(&entry->new_dir, best);2293}2294/*2295 * The relevant directory sub-portion of the original full2296 * filepaths were xstrndup'ed before inserting into2297 * possible_new_dirs, and instead of manually iterating the2298 * list and free'ing each, just lie and tell2299 * possible_new_dirs that it did the strdup'ing so that it2300 * will free them for us.2301 */2302 entry->possible_new_dirs.strdup_strings =1;2303string_list_clear(&entry->possible_new_dirs,1);2304}23052306return dir_renames;2307}23082309static struct dir_rename_entry *check_dir_renamed(const char*path,2310struct hashmap *dir_renames)2311{2312char*temp =xstrdup(path);2313char*end;2314struct dir_rename_entry *entry = NULL;;23152316while((end =strrchr(temp,'/'))) {2317*end ='\0';2318 entry =dir_rename_find_entry(dir_renames, temp);2319if(entry)2320break;2321}2322free(temp);2323return entry;2324}23252326static voidcompute_collisions(struct hashmap *collisions,2327struct hashmap *dir_renames,2328struct diff_queue_struct *pairs)2329{2330int i;23312332/*2333 * Multiple files can be mapped to the same path due to directory2334 * renames done by the other side of history. Since that other2335 * side of history could have merged multiple directories into one,2336 * if our side of history added the same file basename to each of2337 * those directories, then all N of them would get implicitly2338 * renamed by the directory rename detection into the same path,2339 * and we'd get an add/add/.../add conflict, and all those adds2340 * from *this* side of history. This is not representable in the2341 * index, and users aren't going to easily be able to make sense of2342 * it. So we need to provide a good warning about what's2343 * happening, and fall back to no-directory-rename detection2344 * behavior for those paths.2345 *2346 * See testcases 9e and all of section 5 from t6043 for examples.2347 */2348collision_init(collisions);23492350for(i =0; i < pairs->nr; ++i) {2351struct dir_rename_entry *dir_rename_ent;2352struct collision_entry *collision_ent;2353char*new_path;2354struct diff_filepair *pair = pairs->queue[i];23552356if(pair->status !='A'&& pair->status !='R')2357continue;2358 dir_rename_ent =check_dir_renamed(pair->two->path,2359 dir_renames);2360if(!dir_rename_ent)2361continue;23622363 new_path =apply_dir_rename(dir_rename_ent, pair->two->path);2364if(!new_path)2365/*2366 * dir_rename_ent->non_unique_new_path is true, which2367 * means there is no directory rename for us to use,2368 * which means it won't cause us any additional2369 * collisions.2370 */2371continue;2372 collision_ent =collision_find_entry(collisions, new_path);2373if(!collision_ent) {2374 collision_ent =xcalloc(1,2375sizeof(struct collision_entry));2376hashmap_entry_init(collision_ent,strhash(new_path));2377hashmap_put(collisions, collision_ent);2378 collision_ent->target_file = new_path;2379}else{2380free(new_path);2381}2382string_list_insert(&collision_ent->source_files,2383 pair->two->path);2384}2385}23862387static char*check_for_directory_rename(struct merge_options *o,2388const char*path,2389struct tree *tree,2390struct hashmap *dir_renames,2391struct hashmap *dir_rename_exclusions,2392struct hashmap *collisions,2393int*clean_merge)2394{2395char*new_path = NULL;2396struct dir_rename_entry *entry =check_dir_renamed(path, dir_renames);2397struct dir_rename_entry *oentry = NULL;23982399if(!entry)2400return new_path;24012402/*2403 * This next part is a little weird. We do not want to do an2404 * implicit rename into a directory we renamed on our side, because2405 * that will result in a spurious rename/rename(1to2) conflict. An2406 * example:2407 * Base commit: dumbdir/afile, otherdir/bfile2408 * Side 1: smrtdir/afile, otherdir/bfile2409 * Side 2: dumbdir/afile, dumbdir/bfile2410 * Here, while working on Side 1, we could notice that otherdir was2411 * renamed/merged to dumbdir, and change the diff_filepair for2412 * otherdir/bfile into a rename into dumbdir/bfile. However, Side2413 * 2 will notice the rename from dumbdir to smrtdir, and do the2414 * transitive rename to move it from dumbdir/bfile to2415 * smrtdir/bfile. That gives us bfile in dumbdir vs being in2416 * smrtdir, a rename/rename(1to2) conflict. We really just want2417 * the file to end up in smrtdir. And the way to achieve that is2418 * to not let Side1 do the rename to dumbdir, since we know that is2419 * the source of one of our directory renames.2420 *2421 * That's why oentry and dir_rename_exclusions is here.2422 *2423 * As it turns out, this also prevents N-way transient rename2424 * confusion; See testcases 9c and 9d of t6043.2425 */2426 oentry =dir_rename_find_entry(dir_rename_exclusions, entry->new_dir.buf);2427if(oentry) {2428output(o,1,_("WARNING: Avoiding applying%s->%srename "2429"to%s, because%sitself was renamed."),2430 entry->dir, entry->new_dir.buf, path, entry->new_dir.buf);2431}else{2432 new_path =handle_path_level_conflicts(o, path, entry,2433 collisions, tree);2434*clean_merge &= (new_path != NULL);2435}24362437return new_path;2438}24392440static voidapply_directory_rename_modifications(struct merge_options *o,2441struct diff_filepair *pair,2442char*new_path,2443struct rename *re,2444struct tree *tree,2445struct tree *o_tree,2446struct tree *a_tree,2447struct tree *b_tree,2448struct string_list *entries,2449int*clean)2450{2451struct string_list_item *item;2452int stage = (tree == a_tree ?2:3);2453int update_wd;24542455/*2456 * In all cases where we can do directory rename detection,2457 * unpack_trees() will have read pair->two->path into the2458 * index and the working copy. We need to remove it so that2459 * we can instead place it at new_path. It is guaranteed to2460 * not be untracked (unpack_trees() would have errored out2461 * saying the file would have been overwritten), but it might2462 * be dirty, though.2463 */2464 update_wd = !was_dirty(o, pair->two->path);2465if(!update_wd)2466output(o,1,_("Refusing to lose dirty file at%s"),2467 pair->two->path);2468remove_file(o,1, pair->two->path, !update_wd);24692470/* Find or create a new re->dst_entry */2471 item =string_list_lookup(entries, new_path);2472if(item) {2473/*2474 * Since we're renaming on this side of history, and it's2475 * due to a directory rename on the other side of history2476 * (which we only allow when the directory in question no2477 * longer exists on the other side of history), the2478 * original entry for re->dst_entry is no longer2479 * necessary...2480 */2481 re->dst_entry->processed =1;24822483/*2484 * ...because we'll be using this new one.2485 */2486 re->dst_entry = item->util;2487}else{2488/*2489 * re->dst_entry is for the before-dir-rename path, and we2490 * need it to hold information for the after-dir-rename2491 * path. Before creating a new entry, we need to mark the2492 * old one as unnecessary (...unless it is shared by2493 * src_entry, i.e. this didn't use to be a rename, in which2494 * case we can just allow the normal processing to happen2495 * for it).2496 */2497if(pair->status =='R')2498 re->dst_entry->processed =1;24992500 re->dst_entry =insert_stage_data(new_path,2501 o_tree, a_tree, b_tree,2502 entries);2503 item =string_list_insert(entries, new_path);2504 item->util = re->dst_entry;2505}25062507/*2508 * Update the stage_data with the information about the path we are2509 * moving into place. That slot will be empty and available for us2510 * to write to because of the collision checks in2511 * handle_path_level_conflicts(). In other words,2512 * re->dst_entry->stages[stage].oid will be the null_oid, so it's2513 * open for us to write to.2514 *2515 * It may be tempting to actually update the index at this point as2516 * well, using update_stages_for_stage_data(), but as per the big2517 * "NOTE" in update_stages(), doing so will modify the current2518 * in-memory index which will break calls to would_lose_untracked()2519 * that we need to make. Instead, we need to just make sure that2520 * the various handle_rename_*() functions update the index2521 * explicitly rather than relying on unpack_trees() to have done it.2522 */2523get_tree_entry(&tree->object.oid,2524 pair->two->path,2525&re->dst_entry->stages[stage].oid,2526&re->dst_entry->stages[stage].mode);25272528/* Update pair status */2529if(pair->status =='A') {2530/*2531 * Recording rename information for this add makes it look2532 * like a rename/delete conflict. Make sure we can2533 * correctly handle this as an add that was moved to a new2534 * directory instead of reporting a rename/delete conflict.2535 */2536 re->add_turned_into_rename =1;2537}2538/*2539 * We don't actually look at pair->status again, but it seems2540 * pedagogically correct to adjust it.2541 */2542 pair->status ='R';25432544/*2545 * Finally, record the new location.2546 */2547 pair->two->path = new_path;2548}25492550/*2551 * Get information of all renames which occurred in 'pairs', making use of2552 * any implicit directory renames inferred from the other side of history.2553 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')2554 * to be able to associate the correct cache entries with the rename2555 * information; tree is always equal to either a_tree or b_tree.2556 */2557static struct string_list *get_renames(struct merge_options *o,2558struct diff_queue_struct *pairs,2559struct hashmap *dir_renames,2560struct hashmap *dir_rename_exclusions,2561struct tree *tree,2562struct tree *o_tree,2563struct tree *a_tree,2564struct tree *b_tree,2565struct string_list *entries,2566int*clean_merge)2567{2568int i;2569struct hashmap collisions;2570struct hashmap_iter iter;2571struct collision_entry *e;2572struct string_list *renames;25732574compute_collisions(&collisions, dir_renames, pairs);2575 renames =xcalloc(1,sizeof(struct string_list));25762577for(i =0; i < pairs->nr; ++i) {2578struct string_list_item *item;2579struct rename *re;2580struct diff_filepair *pair = pairs->queue[i];2581char*new_path;/* non-NULL only with directory renames */25822583if(pair->status !='A'&& pair->status !='R') {2584diff_free_filepair(pair);2585continue;2586}2587 new_path =check_for_directory_rename(o, pair->two->path, tree,2588 dir_renames,2589 dir_rename_exclusions,2590&collisions,2591 clean_merge);2592if(pair->status !='R'&& !new_path) {2593diff_free_filepair(pair);2594continue;2595}25962597 re =xmalloc(sizeof(*re));2598 re->processed =0;2599 re->add_turned_into_rename =0;2600 re->pair = pair;2601 item =string_list_lookup(entries, re->pair->one->path);2602if(!item)2603 re->src_entry =insert_stage_data(re->pair->one->path,2604 o_tree, a_tree, b_tree, entries);2605else2606 re->src_entry = item->util;26072608 item =string_list_lookup(entries, re->pair->two->path);2609if(!item)2610 re->dst_entry =insert_stage_data(re->pair->two->path,2611 o_tree, a_tree, b_tree, entries);2612else2613 re->dst_entry = item->util;2614 item =string_list_insert(renames, pair->one->path);2615 item->util = re;2616if(new_path)2617apply_directory_rename_modifications(o, pair, new_path,2618 re, tree, o_tree,2619 a_tree, b_tree,2620 entries,2621 clean_merge);2622}26232624hashmap_iter_init(&collisions, &iter);2625while((e =hashmap_iter_next(&iter))) {2626free(e->target_file);2627string_list_clear(&e->source_files,0);2628}2629hashmap_free(&collisions,1);2630return renames;2631}26322633static intprocess_renames(struct merge_options *o,2634struct string_list *a_renames,2635struct string_list *b_renames)2636{2637int clean_merge =1, i, j;2638struct string_list a_by_dst = STRING_LIST_INIT_NODUP;2639struct string_list b_by_dst = STRING_LIST_INIT_NODUP;2640const struct rename *sre;26412642for(i =0; i < a_renames->nr; i++) {2643 sre = a_renames->items[i].util;2644string_list_insert(&a_by_dst, sre->pair->two->path)->util2645= (void*)sre;2646}2647for(i =0; i < b_renames->nr; i++) {2648 sre = b_renames->items[i].util;2649string_list_insert(&b_by_dst, sre->pair->two->path)->util2650= (void*)sre;2651}26522653for(i =0, j =0; i < a_renames->nr || j < b_renames->nr;) {2654struct string_list *renames1, *renames2Dst;2655struct rename *ren1 = NULL, *ren2 = NULL;2656const char*branch1, *branch2;2657const char*ren1_src, *ren1_dst;2658struct string_list_item *lookup;26592660if(i >= a_renames->nr) {2661 ren2 = b_renames->items[j++].util;2662}else if(j >= b_renames->nr) {2663 ren1 = a_renames->items[i++].util;2664}else{2665int compare =strcmp(a_renames->items[i].string,2666 b_renames->items[j].string);2667if(compare <=0)2668 ren1 = a_renames->items[i++].util;2669if(compare >=0)2670 ren2 = b_renames->items[j++].util;2671}26722673/* TODO: refactor, so that 1/2 are not needed */2674if(ren1) {2675 renames1 = a_renames;2676 renames2Dst = &b_by_dst;2677 branch1 = o->branch1;2678 branch2 = o->branch2;2679}else{2680 renames1 = b_renames;2681 renames2Dst = &a_by_dst;2682 branch1 = o->branch2;2683 branch2 = o->branch1;2684SWAP(ren2, ren1);2685}26862687if(ren1->processed)2688continue;2689 ren1->processed =1;2690 ren1->dst_entry->processed =1;2691/* BUG: We should only mark src_entry as processed if we2692 * are not dealing with a rename + add-source case.2693 */2694 ren1->src_entry->processed =1;26952696 ren1_src = ren1->pair->one->path;2697 ren1_dst = ren1->pair->two->path;26982699if(ren2) {2700/* One file renamed on both sides */2701const char*ren2_src = ren2->pair->one->path;2702const char*ren2_dst = ren2->pair->two->path;2703enum rename_type rename_type;2704if(strcmp(ren1_src, ren2_src) !=0)2705BUG("ren1_src != ren2_src");2706 ren2->dst_entry->processed =1;2707 ren2->processed =1;2708if(strcmp(ren1_dst, ren2_dst) !=0) {2709 rename_type = RENAME_ONE_FILE_TO_TWO;2710 clean_merge =0;2711}else{2712 rename_type = RENAME_ONE_FILE_TO_ONE;2713/* BUG: We should only remove ren1_src in2714 * the base stage (think of rename +2715 * add-source cases).2716 */2717remove_file(o,1, ren1_src,1);2718update_entry(ren1->dst_entry,2719 ren1->pair->one,2720 ren1->pair->two,2721 ren2->pair->two);2722}2723setup_rename_conflict_info(rename_type,2724 ren1->pair,2725 ren2->pair,2726 branch1,2727 branch2,2728 ren1->dst_entry,2729 ren2->dst_entry,2730 o,2731 NULL,2732 NULL);2733}else if((lookup =string_list_lookup(renames2Dst, ren1_dst))) {2734/* Two different files renamed to the same thing */2735char*ren2_dst;2736 ren2 = lookup->util;2737 ren2_dst = ren2->pair->two->path;2738if(strcmp(ren1_dst, ren2_dst) !=0)2739BUG("ren1_dst != ren2_dst");27402741 clean_merge =0;2742 ren2->processed =1;2743/*2744 * BUG: We should only mark src_entry as processed2745 * if we are not dealing with a rename + add-source2746 * case.2747 */2748 ren2->src_entry->processed =1;27492750setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,2751 ren1->pair,2752 ren2->pair,2753 branch1,2754 branch2,2755 ren1->dst_entry,2756 ren2->dst_entry,2757 o,2758 ren1->src_entry,2759 ren2->src_entry);27602761}else{2762/* Renamed in 1, maybe changed in 2 */2763/* we only use sha1 and mode of these */2764struct diff_filespec src_other, dst_other;2765int try_merge;27662767/*2768 * unpack_trees loads entries from common-commit2769 * into stage 1, from head-commit into stage 2, and2770 * from merge-commit into stage 3. We keep track2771 * of which side corresponds to the rename.2772 */2773int renamed_stage = a_renames == renames1 ?2:3;2774int other_stage = a_renames == renames1 ?3:2;27752776/* BUG: We should only remove ren1_src in the base2777 * stage and in other_stage (think of rename +2778 * add-source case).2779 */2780remove_file(o,1, ren1_src,2781 renamed_stage ==2|| !was_tracked(o, ren1_src));27822783oidcpy(&src_other.oid,2784&ren1->src_entry->stages[other_stage].oid);2785 src_other.mode = ren1->src_entry->stages[other_stage].mode;2786oidcpy(&dst_other.oid,2787&ren1->dst_entry->stages[other_stage].oid);2788 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;2789 try_merge =0;27902791if(oid_eq(&src_other.oid, &null_oid) &&2792 ren1->add_turned_into_rename) {2793setup_rename_conflict_info(RENAME_VIA_DIR,2794 ren1->pair,2795 NULL,2796 branch1,2797 branch2,2798 ren1->dst_entry,2799 NULL,2800 o,2801 NULL,2802 NULL);2803}else if(oid_eq(&src_other.oid, &null_oid)) {2804setup_rename_conflict_info(RENAME_DELETE,2805 ren1->pair,2806 NULL,2807 branch1,2808 branch2,2809 ren1->dst_entry,2810 NULL,2811 o,2812 NULL,2813 NULL);2814}else if((dst_other.mode == ren1->pair->two->mode) &&2815oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {2816/*2817 * Added file on the other side identical to2818 * the file being renamed: clean merge.2819 * Also, there is no need to overwrite the2820 * file already in the working copy, so call2821 * update_file_flags() instead of2822 * update_file().2823 */2824if(update_file_flags(o,2825&ren1->pair->two->oid,2826 ren1->pair->two->mode,2827 ren1_dst,28281,/* update_cache */28290/* update_wd */))2830 clean_merge = -1;2831}else if(!oid_eq(&dst_other.oid, &null_oid)) {2832/*2833 * Probably not a clean merge, but it's2834 * premature to set clean_merge to 0 here,2835 * because if the rename merges cleanly and2836 * the merge exactly matches the newly added2837 * file, then the merge will be clean.2838 */2839setup_rename_conflict_info(RENAME_ADD,2840 ren1->pair,2841 NULL,2842 branch1,2843 branch2,2844 ren1->dst_entry,2845 NULL,2846 o,2847 ren1->src_entry,2848 NULL);2849}else2850 try_merge =1;28512852if(clean_merge <0)2853goto cleanup_and_return;2854if(try_merge) {2855struct diff_filespec *one, *a, *b;2856 src_other.path = (char*)ren1_src;28572858 one = ren1->pair->one;2859if(a_renames == renames1) {2860 a = ren1->pair->two;2861 b = &src_other;2862}else{2863 b = ren1->pair->two;2864 a = &src_other;2865}2866update_entry(ren1->dst_entry, one, a, b);2867setup_rename_conflict_info(RENAME_NORMAL,2868 ren1->pair,2869 NULL,2870 branch1,2871 NULL,2872 ren1->dst_entry,2873 NULL,2874 o,2875 NULL,2876 NULL);2877}2878}2879}2880cleanup_and_return:2881string_list_clear(&a_by_dst,0);2882string_list_clear(&b_by_dst,0);28832884return clean_merge;2885}28862887struct rename_info {2888struct string_list *head_renames;2889struct string_list *merge_renames;2890};28912892static voidinitial_cleanup_rename(struct diff_queue_struct *pairs,2893struct hashmap *dir_renames)2894{2895struct hashmap_iter iter;2896struct dir_rename_entry *e;28972898hashmap_iter_init(dir_renames, &iter);2899while((e =hashmap_iter_next(&iter))) {2900free(e->dir);2901strbuf_release(&e->new_dir);2902/* possible_new_dirs already cleared in get_directory_renames */2903}2904hashmap_free(dir_renames,1);2905free(dir_renames);29062907free(pairs->queue);2908free(pairs);2909}29102911static intdetect_and_process_renames(struct merge_options *o,2912struct tree *common,2913struct tree *head,2914struct tree *merge,2915struct string_list *entries,2916struct rename_info *ri)2917{2918struct diff_queue_struct *head_pairs, *merge_pairs;2919struct hashmap *dir_re_head, *dir_re_merge;2920int clean =1;29212922 ri->head_renames = NULL;2923 ri->merge_renames = NULL;29242925if(!merge_detect_rename(o))2926return1;29272928 head_pairs =get_diffpairs(o, common, head);2929 merge_pairs =get_diffpairs(o, common, merge);29302931if(o->detect_directory_renames) {2932 dir_re_head =get_directory_renames(head_pairs, head);2933 dir_re_merge =get_directory_renames(merge_pairs, merge);29342935handle_directory_level_conflicts(o,2936 dir_re_head, head,2937 dir_re_merge, merge);2938}else{2939 dir_re_head =xmalloc(sizeof(*dir_re_head));2940 dir_re_merge =xmalloc(sizeof(*dir_re_merge));2941dir_rename_init(dir_re_head);2942dir_rename_init(dir_re_merge);2943}29442945 ri->head_renames =get_renames(o, head_pairs,2946 dir_re_merge, dir_re_head, head,2947 common, head, merge, entries,2948&clean);2949if(clean <0)2950goto cleanup;2951 ri->merge_renames =get_renames(o, merge_pairs,2952 dir_re_head, dir_re_merge, merge,2953 common, head, merge, entries,2954&clean);2955if(clean <0)2956goto cleanup;2957 clean &=process_renames(o, ri->head_renames, ri->merge_renames);29582959cleanup:2960/*2961 * Some cleanup is deferred until cleanup_renames() because the2962 * data structures are still needed and referenced in2963 * process_entry(). But there are a few things we can free now.2964 */2965initial_cleanup_rename(head_pairs, dir_re_head);2966initial_cleanup_rename(merge_pairs, dir_re_merge);29672968return clean;2969}29702971static voidfinal_cleanup_rename(struct string_list *rename)2972{2973const struct rename *re;2974int i;29752976if(rename == NULL)2977return;29782979for(i =0; i < rename->nr; i++) {2980 re = rename->items[i].util;2981diff_free_filepair(re->pair);2982}2983string_list_clear(rename,1);2984free(rename);2985}29862987static voidfinal_cleanup_renames(struct rename_info *re_info)2988{2989final_cleanup_rename(re_info->head_renames);2990final_cleanup_rename(re_info->merge_renames);2991}29922993static struct object_id *stage_oid(const struct object_id *oid,unsigned mode)2994{2995return(is_null_oid(oid) || mode ==0) ? NULL: (struct object_id *)oid;2996}29972998static intread_oid_strbuf(struct merge_options *o,2999const struct object_id *oid,3000struct strbuf *dst)3001{3002void*buf;3003enum object_type type;3004unsigned long size;3005 buf =read_object_file(oid, &type, &size);3006if(!buf)3007returnerr(o,_("cannot read object%s"),oid_to_hex(oid));3008if(type != OBJ_BLOB) {3009free(buf);3010returnerr(o,_("object%sis not a blob"),oid_to_hex(oid));3011}3012strbuf_attach(dst, buf, size, size +1);3013return0;3014}30153016static intblob_unchanged(struct merge_options *opt,3017const struct object_id *o_oid,3018unsigned o_mode,3019const struct object_id *a_oid,3020unsigned a_mode,3021int renormalize,const char*path)3022{3023struct strbuf o = STRBUF_INIT;3024struct strbuf a = STRBUF_INIT;3025int ret =0;/* assume changed for safety */30263027if(a_mode != o_mode)3028return0;3029if(oid_eq(o_oid, a_oid))3030return1;3031if(!renormalize)3032return0;30333034assert(o_oid && a_oid);3035if(read_oid_strbuf(opt, o_oid, &o) ||read_oid_strbuf(opt, a_oid, &a))3036goto error_return;3037/*3038 * Note: binary | is used so that both renormalizations are3039 * performed. Comparison can be skipped if both files are3040 * unchanged since their sha1s have already been compared.3041 */3042if(renormalize_buffer(&the_index, path, o.buf, o.len, &o) |3043renormalize_buffer(&the_index, path, a.buf, a.len, &a))3044 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));30453046error_return:3047strbuf_release(&o);3048strbuf_release(&a);3049return ret;3050}30513052static inthandle_modify_delete(struct merge_options *o,3053const char*path,3054struct object_id *o_oid,int o_mode,3055struct object_id *a_oid,int a_mode,3056struct object_id *b_oid,int b_mode)3057{3058const char*modify_branch, *delete_branch;3059struct object_id *changed_oid;3060int changed_mode;30613062if(a_oid) {3063 modify_branch = o->branch1;3064 delete_branch = o->branch2;3065 changed_oid = a_oid;3066 changed_mode = a_mode;3067}else{3068 modify_branch = o->branch2;3069 delete_branch = o->branch1;3070 changed_oid = b_oid;3071 changed_mode = b_mode;3072}30733074returnhandle_change_delete(o,3075 path, NULL,3076 o_oid, o_mode,3077 changed_oid, changed_mode,3078 modify_branch, delete_branch,3079_("modify"),_("modified"));3080}30813082static inthandle_content_merge(struct merge_options *o,3083const char*path,3084int is_dirty,3085struct object_id *o_oid,int o_mode,3086struct object_id *a_oid,int a_mode,3087struct object_id *b_oid,int b_mode,3088struct rename_conflict_info *rename_conflict_info)3089{3090const char*reason =_("content");3091const char*path1 = NULL, *path2 = NULL;3092struct merge_file_info mfi;3093struct diff_filespec one, a, b;3094unsigned df_conflict_remains =0;30953096if(!o_oid) {3097 reason =_("add/add");3098 o_oid = (struct object_id *)&null_oid;3099}3100 one.path = a.path = b.path = (char*)path;3101oidcpy(&one.oid, o_oid);3102 one.mode = o_mode;3103oidcpy(&a.oid, a_oid);3104 a.mode = a_mode;3105oidcpy(&b.oid, b_oid);3106 b.mode = b_mode;31073108if(rename_conflict_info) {3109struct diff_filepair *pair1 = rename_conflict_info->pair1;31103111 path1 = (o->branch1 == rename_conflict_info->branch1) ?3112 pair1->two->path : pair1->one->path;3113/* If rename_conflict_info->pair2 != NULL, we are in3114 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a3115 * normal rename.3116 */3117 path2 = (rename_conflict_info->pair2 ||3118 o->branch2 == rename_conflict_info->branch1) ?3119 pair1->two->path : pair1->one->path;3120 one.path = pair1->one->path;3121 a.path = (char*)path1;3122 b.path = (char*)path2;31233124if(dir_in_way(path, !o->call_depth,3125S_ISGITLINK(pair1->two->mode)))3126 df_conflict_remains =1;3127}3128if(merge_mode_and_contents(o, &one, &a, &b, path,3129 o->branch1, o->branch2,3130 o->call_depth *2, &mfi))3131return-1;31323133/*3134 * We can skip updating the working tree file iff:3135 * a) The merge is clean3136 * b) The merge matches what was in HEAD (content, mode, pathname)3137 * c) The target path is usable (i.e. not involved in D/F conflict)3138 */3139if(mfi.clean &&3140was_tracked_and_matches(o, path, &mfi.oid, mfi.mode) &&3141!df_conflict_remains) {3142int pos;3143struct cache_entry *ce;31443145output(o,3,_("Skipped%s(merged same as existing)"), path);3146if(add_cacheinfo(o, mfi.mode, &mfi.oid, path,31470, (!o->call_depth && !is_dirty),0))3148return-1;3149/*3150 * However, add_cacheinfo() will delete the old cache entry3151 * and add a new one. We need to copy over any skip_worktree3152 * flag to avoid making the file appear as if it were3153 * deleted by the user.3154 */3155 pos =index_name_pos(&o->orig_index, path,strlen(path));3156 ce = o->orig_index.cache[pos];3157if(ce_skip_worktree(ce)) {3158 pos =index_name_pos(&the_index, path,strlen(path));3159 ce = the_index.cache[pos];3160 ce->ce_flags |= CE_SKIP_WORKTREE;3161}3162return mfi.clean;3163}31643165if(!mfi.clean) {3166if(S_ISGITLINK(mfi.mode))3167 reason =_("submodule");3168output(o,1,_("CONFLICT (%s): Merge conflict in%s"),3169 reason, path);3170if(rename_conflict_info && !df_conflict_remains)3171if(update_stages(o, path, &one, &a, &b))3172return-1;3173}31743175if(df_conflict_remains || is_dirty) {3176char*new_path;3177if(o->call_depth) {3178remove_file_from_cache(path);3179}else{3180if(!mfi.clean) {3181if(update_stages(o, path, &one, &a, &b))3182return-1;3183}else{3184int file_from_stage2 =was_tracked(o, path);3185struct diff_filespec merged;3186oidcpy(&merged.oid, &mfi.oid);3187 merged.mode = mfi.mode;31883189if(update_stages(o, path, NULL,3190 file_from_stage2 ? &merged : NULL,3191 file_from_stage2 ? NULL : &merged))3192return-1;3193}31943195}3196 new_path =unique_path(o, path, rename_conflict_info->branch1);3197if(is_dirty) {3198output(o,1,_("Refusing to lose dirty file at%s"),3199 path);3200}3201output(o,1,_("Adding as%sinstead"), new_path);3202if(update_file(o,0, &mfi.oid, mfi.mode, new_path)) {3203free(new_path);3204return-1;3205}3206free(new_path);3207 mfi.clean =0;3208}else if(update_file(o, mfi.clean, &mfi.oid, mfi.mode, path))3209return-1;3210return!is_dirty && mfi.clean;3211}32123213static inthandle_rename_normal(struct merge_options *o,3214const char*path,3215struct object_id *o_oid,unsigned int o_mode,3216struct object_id *a_oid,unsigned int a_mode,3217struct object_id *b_oid,unsigned int b_mode,3218struct rename_conflict_info *ci)3219{3220/* Merge the content and write it out */3221returnhandle_content_merge(o, path,was_dirty(o, path),3222 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,3223 ci);3224}32253226/* Per entry merge function */3227static intprocess_entry(struct merge_options *o,3228const char*path,struct stage_data *entry)3229{3230int clean_merge =1;3231int normalize = o->renormalize;3232unsigned o_mode = entry->stages[1].mode;3233unsigned a_mode = entry->stages[2].mode;3234unsigned b_mode = entry->stages[3].mode;3235struct object_id *o_oid =stage_oid(&entry->stages[1].oid, o_mode);3236struct object_id *a_oid =stage_oid(&entry->stages[2].oid, a_mode);3237struct object_id *b_oid =stage_oid(&entry->stages[3].oid, b_mode);32383239 entry->processed =1;3240if(entry->rename_conflict_info) {3241struct rename_conflict_info *conflict_info = entry->rename_conflict_info;3242switch(conflict_info->rename_type) {3243case RENAME_NORMAL:3244case RENAME_ONE_FILE_TO_ONE:3245 clean_merge =handle_rename_normal(o,3246 path,3247 o_oid, o_mode,3248 a_oid, a_mode,3249 b_oid, b_mode,3250 conflict_info);3251break;3252case RENAME_VIA_DIR:3253 clean_merge =1;3254if(handle_rename_via_dir(o,3255 conflict_info->pair1,3256 conflict_info->branch1,3257 conflict_info->branch2))3258 clean_merge = -1;3259break;3260case RENAME_ADD:3261/*3262 * Probably unclean merge, but if the renamed file3263 * merges cleanly and the result can then be3264 * two-way merged cleanly with the added file, I3265 * guess it's a clean merge?3266 */3267 clean_merge =handle_rename_add(o, conflict_info);3268break;3269case RENAME_DELETE:3270 clean_merge =0;3271if(handle_rename_delete(o,3272 conflict_info->pair1,3273 conflict_info->branch1,3274 conflict_info->branch2))3275 clean_merge = -1;3276break;3277case RENAME_ONE_FILE_TO_TWO:3278 clean_merge =0;3279if(handle_rename_rename_1to2(o, conflict_info))3280 clean_merge = -1;3281break;3282case RENAME_TWO_FILES_TO_ONE:3283/*3284 * Probably unclean merge, but if the two renamed3285 * files merge cleanly and the two resulting files3286 * can then be two-way merged cleanly, I guess it's3287 * a clean merge?3288 */3289 clean_merge =handle_rename_rename_2to1(o,3290 conflict_info);3291break;3292default:3293 entry->processed =0;3294break;3295}3296}else if(o_oid && (!a_oid || !b_oid)) {3297/* Case A: Deleted in one */3298if((!a_oid && !b_oid) ||3299(!b_oid &&blob_unchanged(o, o_oid, o_mode, a_oid, a_mode, normalize, path)) ||3300(!a_oid &&blob_unchanged(o, o_oid, o_mode, b_oid, b_mode, normalize, path))) {3301/* Deleted in both or deleted in one and3302 * unchanged in the other */3303if(a_oid)3304output(o,2,_("Removing%s"), path);3305/* do not touch working file if it did not exist */3306remove_file(o,1, path, !a_oid);3307}else{3308/* Modify/delete; deleted side may have put a directory in the way */3309 clean_merge =0;3310if(handle_modify_delete(o, path, o_oid, o_mode,3311 a_oid, a_mode, b_oid, b_mode))3312 clean_merge = -1;3313}3314}else if((!o_oid && a_oid && !b_oid) ||3315(!o_oid && !a_oid && b_oid)) {3316/* Case B: Added in one. */3317/* [nothing|directory] -> ([nothing|directory], file) */33183319const char*add_branch;3320const char*other_branch;3321unsigned mode;3322const struct object_id *oid;3323const char*conf;33243325if(a_oid) {3326 add_branch = o->branch1;3327 other_branch = o->branch2;3328 mode = a_mode;3329 oid = a_oid;3330 conf =_("file/directory");3331}else{3332 add_branch = o->branch2;3333 other_branch = o->branch1;3334 mode = b_mode;3335 oid = b_oid;3336 conf =_("directory/file");3337}3338if(dir_in_way(path,3339!o->call_depth && !S_ISGITLINK(a_mode),33400)) {3341char*new_path =unique_path(o, path, add_branch);3342 clean_merge =0;3343output(o,1,_("CONFLICT (%s): There is a directory with name%sin%s. "3344"Adding%sas%s"),3345 conf, path, other_branch, path, new_path);3346if(update_file(o,0, oid, mode, new_path))3347 clean_merge = -1;3348else if(o->call_depth)3349remove_file_from_cache(path);3350free(new_path);3351}else{3352output(o,2,_("Adding%s"), path);3353/* do not overwrite file if already present */3354if(update_file_flags(o, oid, mode, path,1, !a_oid))3355 clean_merge = -1;3356}3357}else if(a_oid && b_oid) {3358if(!o_oid) {3359/* Case C: Added in both (check for same permissions) */3360output(o,1,3361_("CONFLICT (add/add): Merge conflict in%s"),3362 path);3363 clean_merge =handle_file_collision(o,3364 path, NULL, NULL,3365 o->branch1,3366 o->branch2,3367 a_oid, a_mode,3368 b_oid, b_mode);3369}else{3370/* case D: Modified in both, but differently. */3371int is_dirty =0;/* unpack_trees would have bailed if dirty */3372 clean_merge =handle_content_merge(o, path,3373 is_dirty,3374 o_oid, o_mode,3375 a_oid, a_mode,3376 b_oid, b_mode,3377 NULL);3378}3379}else if(!o_oid && !a_oid && !b_oid) {3380/*3381 * this entry was deleted altogether. a_mode == 0 means3382 * we had that path and want to actively remove it.3383 */3384remove_file(o,1, path, !a_mode);3385}else3386BUG("fatal merge failure, shouldn't happen.");33873388return clean_merge;3389}33903391intmerge_trees(struct merge_options *o,3392struct tree *head,3393struct tree *merge,3394struct tree *common,3395struct tree **result)3396{3397int code, clean;3398struct strbuf sb = STRBUF_INIT;33993400if(!o->call_depth &&index_has_changes(&the_index, head, &sb)) {3401err(o,_("Your local changes to the following files would be overwritten by merge:\n%s"),3402 sb.buf);3403return-1;3404}34053406if(o->subtree_shift) {3407 merge =shift_tree_object(head, merge, o->subtree_shift);3408 common =shift_tree_object(head, common, o->subtree_shift);3409}34103411if(oid_eq(&common->object.oid, &merge->object.oid)) {3412output(o,0,_("Already up to date!"));3413*result = head;3414return1;3415}34163417 code =unpack_trees_start(o, common, head, merge);34183419if(code !=0) {3420if(show(o,4) || o->call_depth)3421err(o,_("merging of trees%sand%sfailed"),3422oid_to_hex(&head->object.oid),3423oid_to_hex(&merge->object.oid));3424unpack_trees_finish(o);3425return-1;3426}34273428if(unmerged_cache()) {3429struct string_list *entries;3430struct rename_info re_info;3431int i;3432/*3433 * Only need the hashmap while processing entries, so3434 * initialize it here and free it when we are done running3435 * through the entries. Keeping it in the merge_options as3436 * opposed to decaring a local hashmap is for convenience3437 * so that we don't have to pass it to around.3438 */3439hashmap_init(&o->current_file_dir_set, path_hashmap_cmp, NULL,512);3440get_files_dirs(o, head);3441get_files_dirs(o, merge);34423443 entries =get_unmerged();3444 clean =detect_and_process_renames(o, common, head, merge,3445 entries, &re_info);3446record_df_conflict_files(o, entries);3447if(clean <0)3448goto cleanup;3449for(i = entries->nr-1;0<= i; i--) {3450const char*path = entries->items[i].string;3451struct stage_data *e = entries->items[i].util;3452if(!e->processed) {3453int ret =process_entry(o, path, e);3454if(!ret)3455 clean =0;3456else if(ret <0) {3457 clean = ret;3458goto cleanup;3459}3460}3461}3462for(i =0; i < entries->nr; i++) {3463struct stage_data *e = entries->items[i].util;3464if(!e->processed)3465BUG("unprocessed path???%s",3466 entries->items[i].string);3467}34683469 cleanup:3470final_cleanup_renames(&re_info);34713472string_list_clear(entries,1);3473free(entries);34743475hashmap_free(&o->current_file_dir_set,1);34763477if(clean <0) {3478unpack_trees_finish(o);3479return clean;3480}3481}3482else3483 clean =1;34843485unpack_trees_finish(o);34863487if(o->call_depth && !(*result =write_tree_from_memory(o)))3488return-1;34893490return clean;3491}34923493static struct commit_list *reverse_commit_list(struct commit_list *list)3494{3495struct commit_list *next = NULL, *current, *backup;3496for(current = list; current; current = backup) {3497 backup = current->next;3498 current->next = next;3499 next = current;3500}3501return next;3502}35033504/*3505 * Merge the commits h1 and h2, return the resulting virtual3506 * commit object and a flag indicating the cleanness of the merge.3507 */3508intmerge_recursive(struct merge_options *o,3509struct commit *h1,3510struct commit *h2,3511struct commit_list *ca,3512struct commit **result)3513{3514struct commit_list *iter;3515struct commit *merged_common_ancestors;3516struct tree *mrtree;3517int clean;35183519if(show(o,4)) {3520output(o,4,_("Merging:"));3521output_commit_title(o, h1);3522output_commit_title(o, h2);3523}35243525if(!ca) {3526 ca =get_merge_bases(h1, h2);3527 ca =reverse_commit_list(ca);3528}35293530if(show(o,5)) {3531unsigned cnt =commit_list_count(ca);35323533output(o,5,Q_("found%ucommon ancestor:",3534"found%ucommon ancestors:", cnt), cnt);3535for(iter = ca; iter; iter = iter->next)3536output_commit_title(o, iter->item);3537}35383539 merged_common_ancestors =pop_commit(&ca);3540if(merged_common_ancestors == NULL) {3541/* if there is no common ancestor, use an empty tree */3542struct tree *tree;35433544 tree =lookup_tree(the_repository, the_repository->hash_algo->empty_tree);3545 merged_common_ancestors =make_virtual_commit(tree,"ancestor");3546}35473548for(iter = ca; iter; iter = iter->next) {3549const char*saved_b1, *saved_b2;3550 o->call_depth++;3551/*3552 * When the merge fails, the result contains files3553 * with conflict markers. The cleanness flag is3554 * ignored (unless indicating an error), it was never3555 * actually used, as result of merge_trees has always3556 * overwritten it: the committed "conflicts" were3557 * already resolved.3558 */3559discard_cache();3560 saved_b1 = o->branch1;3561 saved_b2 = o->branch2;3562 o->branch1 ="Temporary merge branch 1";3563 o->branch2 ="Temporary merge branch 2";3564if(merge_recursive(o, merged_common_ancestors, iter->item,3565 NULL, &merged_common_ancestors) <0)3566return-1;3567 o->branch1 = saved_b1;3568 o->branch2 = saved_b2;3569 o->call_depth--;35703571if(!merged_common_ancestors)3572returnerr(o,_("merge returned no commit"));3573}35743575discard_cache();3576if(!o->call_depth)3577read_cache();35783579 o->ancestor ="merged common ancestors";3580 clean =merge_trees(o,get_commit_tree(h1),get_commit_tree(h2),3581get_commit_tree(merged_common_ancestors),3582&mrtree);3583if(clean <0) {3584flush_output(o);3585return clean;3586}35873588if(o->call_depth) {3589*result =make_virtual_commit(mrtree,"merged tree");3590commit_list_insert(h1, &(*result)->parents);3591commit_list_insert(h2, &(*result)->parents->next);3592}3593flush_output(o);3594if(!o->call_depth && o->buffer_output <2)3595strbuf_release(&o->obuf);3596if(show(o,2))3597diff_warn_rename_limit("merge.renamelimit",3598 o->needed_rename_limit,0);3599return clean;3600}36013602static struct commit *get_ref(const struct object_id *oid,const char*name)3603{3604struct object *object;36053606 object =deref_tag(the_repository,parse_object(the_repository, oid),3607 name,3608strlen(name));3609if(!object)3610return NULL;3611if(object->type == OBJ_TREE)3612returnmake_virtual_commit((struct tree*)object, name);3613if(object->type != OBJ_COMMIT)3614return NULL;3615if(parse_commit((struct commit *)object))3616return NULL;3617return(struct commit *)object;3618}36193620intmerge_recursive_generic(struct merge_options *o,3621const struct object_id *head,3622const struct object_id *merge,3623int num_base_list,3624const struct object_id **base_list,3625struct commit **result)3626{3627int clean;3628struct lock_file lock = LOCK_INIT;3629struct commit *head_commit =get_ref(head, o->branch1);3630struct commit *next_commit =get_ref(merge, o->branch2);3631struct commit_list *ca = NULL;36323633if(base_list) {3634int i;3635for(i =0; i < num_base_list; ++i) {3636struct commit *base;3637if(!(base =get_ref(base_list[i],oid_to_hex(base_list[i]))))3638returnerr(o,_("Could not parse object '%s'"),3639oid_to_hex(base_list[i]));3640commit_list_insert(base, &ca);3641}3642}36433644hold_locked_index(&lock, LOCK_DIE_ON_ERROR);3645 clean =merge_recursive(o, head_commit, next_commit, ca,3646 result);3647if(clean <0) {3648rollback_lock_file(&lock);3649return clean;3650}36513652if(write_locked_index(&the_index, &lock,3653 COMMIT_LOCK | SKIP_IF_UNCHANGED))3654returnerr(o,_("Unable to write index."));36553656return clean ?0:1;3657}36583659static voidmerge_recursive_config(struct merge_options *o)3660{3661char*value = NULL;3662git_config_get_int("merge.verbosity", &o->verbosity);3663git_config_get_int("diff.renamelimit", &o->diff_rename_limit);3664git_config_get_int("merge.renamelimit", &o->merge_rename_limit);3665if(!git_config_get_string("diff.renames", &value)) {3666 o->diff_detect_rename =git_config_rename("diff.renames", value);3667free(value);3668}3669if(!git_config_get_string("merge.renames", &value)) {3670 o->merge_detect_rename =git_config_rename("merge.renames", value);3671free(value);3672}3673git_config(git_xmerge_config, NULL);3674}36753676voidinit_merge_options(struct merge_options *o)3677{3678const char*merge_verbosity;3679memset(o,0,sizeof(struct merge_options));3680 o->verbosity =2;3681 o->buffer_output =1;3682 o->diff_rename_limit = -1;3683 o->merge_rename_limit = -1;3684 o->renormalize =0;3685 o->diff_detect_rename = -1;3686 o->merge_detect_rename = -1;3687 o->detect_directory_renames =1;3688merge_recursive_config(o);3689 merge_verbosity =getenv("GIT_MERGE_VERBOSITY");3690if(merge_verbosity)3691 o->verbosity =strtol(merge_verbosity, NULL,10);3692if(o->verbosity >=5)3693 o->buffer_output =0;3694strbuf_init(&o->obuf,0);3695string_list_init(&o->df_conflict_file_set,1);3696}36973698intparse_merge_opt(struct merge_options *o,const char*s)3699{3700const char*arg;37013702if(!s || !*s)3703return-1;3704if(!strcmp(s,"ours"))3705 o->recursive_variant = MERGE_RECURSIVE_OURS;3706else if(!strcmp(s,"theirs"))3707 o->recursive_variant = MERGE_RECURSIVE_THEIRS;3708else if(!strcmp(s,"subtree"))3709 o->subtree_shift ="";3710else if(skip_prefix(s,"subtree=", &arg))3711 o->subtree_shift = arg;3712else if(!strcmp(s,"patience"))3713 o->xdl_opts =DIFF_WITH_ALG(o, PATIENCE_DIFF);3714else if(!strcmp(s,"histogram"))3715 o->xdl_opts =DIFF_WITH_ALG(o, HISTOGRAM_DIFF);3716else if(skip_prefix(s,"diff-algorithm=", &arg)) {3717long value =parse_algorithm_value(arg);3718if(value <0)3719return-1;3720/* clear out previous settings */3721DIFF_XDL_CLR(o, NEED_MINIMAL);3722 o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;3723 o->xdl_opts |= value;3724}3725else if(!strcmp(s,"ignore-space-change"))3726DIFF_XDL_SET(o, IGNORE_WHITESPACE_CHANGE);3727else if(!strcmp(s,"ignore-all-space"))3728DIFF_XDL_SET(o, IGNORE_WHITESPACE);3729else if(!strcmp(s,"ignore-space-at-eol"))3730DIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL);3731else if(!strcmp(s,"ignore-cr-at-eol"))3732DIFF_XDL_SET(o, IGNORE_CR_AT_EOL);3733else if(!strcmp(s,"renormalize"))3734 o->renormalize =1;3735else if(!strcmp(s,"no-renormalize"))3736 o->renormalize =0;3737else if(!strcmp(s,"no-renames"))3738 o->merge_detect_rename =0;3739else if(!strcmp(s,"find-renames")) {3740 o->merge_detect_rename =1;3741 o->rename_score =0;3742}3743else if(skip_prefix(s,"find-renames=", &arg) ||3744skip_prefix(s,"rename-threshold=", &arg)) {3745if((o->rename_score =parse_rename_score(&arg)) == -1|| *arg !=0)3746return-1;3747 o->merge_detect_rename =1;3748}3749else3750return-1;3751return0;3752}