@matheusbsbs / matheus-bagliano / commits / 53e88a0353

merge-ort: add implementation of both sides renaming differently

Implement rename/rename(1to2) handling, i.e. both sides of history renaming a file and rename it differently. This code replaces the following from merge-recurisve.c: * all the 1to2 code in process_renames() * the RENAME_ONE_FILE_TO_TWO case of process_entry() * handle_rename_rename_1to2() Also, there is some shared code from merge-recursive.c for multiple different rename cases which we will no longer need for this case (or other rename cases): * handle_file_collision() * setup_rename_conflict_info() The consolidation of five separate codepaths into one is made possible by a change in design: process_renames() tweaks the conflict_info entries within opt->priv->paths such that process_entry() can then handle all the non-rename conflict types (directory/file, modify/delete, etc.) orthogonally. This means we're much less likely to miss special implementation of some kind of combination of conflict types (see commits brought in by 66c62eaec6 ("Merge branch 'en/merge-tests'", 2020-11-18), especially commit ef52778708 ("merge tests: expect improved directory/file conflict handling in ort", 2020-10-26) for more details). That, together with letting worktree/index updating be handled orthogonally in the merge_switch_to_result() function, dramatically simplifies the code for various special rename cases. To be fair, there is a _slight_ tweak to process_entry() here to make sure that the two different paths aren't marked as clean but are left in a conflicted state. So process_renames() and process_entry() aren't quite entirely orthogonal, but they are pretty close. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Dec 15, 2020 at 18:28 UTC 53e88a03539db70a7e990489784400b0b2916fa9
1 file changed +55 -3
merge-ort.c
+55 -3
@@ -676,6 +676,7 @@ static int process_renames(struct merge_options *opt,
676 const char *pathnames[3];
677 struct version_info merged;
678 struct conflict_info *base, *side1, *side2;
679 + unsigned was_binary_blob = 0;
680
681 pathnames[0] = oldpath;
682 pathnames[1] = newpath;
@@ -706,7 +707,58 @@ static int process_renames(struct merge_options *opt,
707 }
708
709 /* This is a rename/rename(1to2) */
709 - die("Not yet implemented");
710 + clean_merge = handle_content_merge(opt,
711 + pair->one->path,
712 + &base->stages[0],
713 + &side1->stages[1],
714 + &side2->stages[2],
715 + pathnames,
716 + 1 + 2 * opt->priv->call_depth,
717 + &merged);
718 + if (!clean_merge &&
719 + merged.mode == side1->stages[1].mode &&
720 + oideq(&merged.oid, &side1->stages[1].oid))
721 + was_binary_blob = 1;
722 + memcpy(&side1->stages[1], &merged, sizeof(merged));
723 + if (was_binary_blob) {
724 + /*
725 + * Getting here means we were attempting to
726 + * merge a binary blob.
727 + *
728 + * Since we can't merge binaries,
729 + * handle_content_merge() just takes one
730 + * side. But we don't want to copy the
731 + * contents of one side to both paths. We
732 + * used the contents of side1 above for
733 + * side1->stages, let's use the contents of
734 + * side2 for side2->stages below.
735 + */
736 + oidcpy(&merged.oid, &side2->stages[2].oid);
737 + merged.mode = side2->stages[2].mode;
738 + }
739 + memcpy(&side2->stages[2], &merged, sizeof(merged));
740 +
741 + side1->path_conflict = 1;
742 + side2->path_conflict = 1;
743 + /*
744 + * TODO: For renames we normally remove the path at the
745 + * old name. It would thus seem consistent to do the
746 + * same for rename/rename(1to2) cases, but we haven't
747 + * done so traditionally and a number of the regression
748 + * tests now encode an expectation that the file is
749 + * left there at stage 1. If we ever decide to change
750 + * this, add the following two lines here:
751 + * base->merged.is_null = 1;
752 + * base->merged.clean = 1;
753 + * and remove the setting of base->path_conflict to 1.
754 + */
755 + base->path_conflict = 1;
756 + path_msg(opt, oldpath, 0,
757 + _("CONFLICT (rename/rename): %s renamed to "
758 + "%s in %s and to %s in %s."),
759 + pathnames[0],
760 + pathnames[1], opt->branch1,
761 + pathnames[2], opt->branch2);
762
763 i++; /* We handled both renames, i.e. i+1 handled */
764 continue;
@@ -1291,13 +1343,13 @@ static void process_entry(struct merge_options *opt,
1343 int side = (ci->filemask == 4) ? 2 : 1;
1344 ci->merged.result.mode = ci->stages[side].mode;
1345 oidcpy(&ci->merged.result.oid, &ci->stages[side].oid);
1294 - ci->merged.clean = !ci->df_conflict;
1346 + ci->merged.clean = !ci->df_conflict && !ci->path_conflict;
1347 } else if (ci->filemask == 1) {
1348 /* Deleted on both sides */
1349 ci->merged.is_null = 1;
1350 ci->merged.result.mode = 0;
1351 oidcpy(&ci->merged.result.oid, &null_oid);
1300 - ci->merged.clean = 1;
1352 + ci->merged.clean = !ci->path_conflict;
1353 }
1354
1355 /*