merge-ort: add implementation of normal rename handling

newren · gitster · commit f1665e69188f · 2020-12-15T17:18:32.000-08:00
Implement handling of normal renames. This code replaces the following from merge-recurisve.c: * the code relevant to RENAME_NORMAL in process_renames() * the RENAME_NORMAL case of process_entry() 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_rename_normal() * setup_rename_conflict_info() The consolidation of four 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 66c62ea ("Merge branch 'en/merge-tests'", 2020-11-18), especially commit ef52778 ("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, the code for handling normal renames wasn't all that complicated beforehand, but it's still much simpler now.) Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/merge-ort.c b/merge-ort.c
@@ -870,7 +870,11 @@ static int process_renames(struct merge_options *opt,
 					 rename_branch, delete_branch);
 			} else {
 				/* normal rename */
-				die("Not yet implemented");
+				memcpy(&newinfo->stages[other_source_index],
+				       &oldinfo->stages[other_source_index],
+				       sizeof(newinfo->stages[0]));
+				newinfo->filemask |= (1 << other_source_index);
+				newinfo->pathnames[other_source_index] = oldpath;
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -870,7 +870,11 @@ static int process_renames(struct merge_options *opt,`
`870`	`870`	`rename_branch, delete_branch);`
`871`	`871`	`} else {`
`872`	`872`	`/* normal rename */`
`873`		`- die("Not yet implemented");`
	`873`	`+ memcpy(&newinfo->stages[other_source_index],`
	`874`	`+ &oldinfo->stages[other_source_index],`
	`875`	`+ sizeof(newinfo->stages[0]));`
	`876`	`+ newinfo->filemask \|= (1 << other_source_index);`
	`877`	`+ newinfo->pathnames[other_source_index] = oldpath;`
`874`	`878`	`}`
`875`	`879`	`}`
`876`	`880`