mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-ort: shuffle the computation and cleanup of potential collisions

Browse Source 
Run compute_collisions() for renames on both sides of history before
any calls to collect_renames(), and do not free the computed collisions
until after both calls to collect_renames().  This is just a code
reorganization at this point that doesn't make sense on its own, but
will permit us to use the computed collision info from both sides
within each call to collect_renames() in a subsequent commit.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2022-07-05 01:33:42 +00:00
committed by Junio C Hamano
parent 6dd1f0e9d4
commit 3ffbe5a223
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
merge-ort.c
View File

@ -2335,7 +2335,8 @@ static char *check_for_directory_rename(struct merge_options *opt,
} }
new_path = handle_path_level_conflicts(opt, path, side_index, new_path = handle_path_level_conflicts(opt, path, side_index,
rename_info, collisions); rename_info,
&collisions[side_index]);
*clean_merge &= (new_path != NULL); *clean_merge &= (new_path != NULL);
return new_path; return new_path;
@ -3044,16 +3045,15 @@ static int detect_regular_renames(struct merge_options *opt,
static int collect_renames(struct merge_options *opt, static int collect_renames(struct merge_options *opt,
struct diff_queue_struct *result, struct diff_queue_struct *result,
unsigned side_index, unsigned side_index,
struct strmap *collisions,
struct strmap *dir_renames_for_side, struct strmap *dir_renames_for_side,
struct strmap *rename_exclusions) struct strmap *rename_exclusions)
{ {
int i, clean = 1; int i, clean = 1;
struct strmap collisions;
struct diff_queue_struct *side_pairs; struct diff_queue_struct *side_pairs;
struct rename_info *renames = &opt->priv->renames; struct rename_info *renames = &opt->priv->renames;
side_pairs = &renames->pairs[side_index]; side_pairs = &renames->pairs[side_index];
compute_collisions(&collisions, dir_renames_for_side, side_pairs);
for (i = 0; i < side_pairs->nr; ++i) { for (i = 0; i < side_pairs->nr; ++i) {
struct diff_filepair *p = side_pairs->queue[i]; struct diff_filepair *p = side_pairs->queue[i];
@ -3069,7 +3069,7 @@ static int collect_renames(struct merge_options *opt,
side_index, side_index,
dir_renames_for_side, dir_renames_for_side,
rename_exclusions, rename_exclusions,
&collisions, collisions,
&clean); &clean);
possibly_cache_new_pair(renames, p, side_index, new_path); possibly_cache_new_pair(renames, p, side_index, new_path);
@ -3095,7 +3095,6 @@ static int collect_renames(struct merge_options *opt,
result->queue[result->nr++] = p; result->queue[result->nr++] = p;
} }
free_collisions(&collisions);
return clean; return clean;
} }
@ -3106,6 +3105,7 @@ static int detect_and_process_renames(struct merge_options *opt,
{ {
struct diff_queue_struct combined = { 0 }; struct diff_queue_struct combined = { 0 };
struct rename_info *renames = &opt->priv->renames; struct rename_info *renames = &opt->priv->renames;
struct strmap collisions[3];
int need_dir_renames, s, i, clean = 1; int need_dir_renames, s, i, clean = 1;
unsigned detection_run = 0; unsigned detection_run = 0;
@ -3155,12 +3155,22 @@ static int detect_and_process_renames(struct merge_options *opt,
ALLOC_GROW(combined.queue, ALLOC_GROW(combined.queue,
renames->pairs[1].nr + renames->pairs[2].nr, renames->pairs[1].nr + renames->pairs[2].nr,
combined.alloc); combined.alloc);
for (i = MERGE_SIDE1; i <= MERGE_SIDE2; i++) {
int other_side = 3 - i;
compute_collisions(&collisions[i],
&renames->dir_renames[other_side],
&renames->pairs[i]);
}
clean &= collect_renames(opt, &combined, MERGE_SIDE1, clean &= collect_renames(opt, &combined, MERGE_SIDE1,
collisions,
&renames->dir_renames[2], &renames->dir_renames[2],
&renames->dir_renames[1]); &renames->dir_renames[1]);
clean &= collect_renames(opt, &combined, MERGE_SIDE2, clean &= collect_renames(opt, &combined, MERGE_SIDE2,
collisions,
&renames->dir_renames[1], &renames->dir_renames[1],
&renames->dir_renames[2]); &renames->dir_renames[2]);
for (i = MERGE_SIDE1; i <= MERGE_SIDE2; i++)
free_collisions(&collisions[i]);
STABLE_QSORT(combined.queue, combined.nr, compare_pairs); STABLE_QSORT(combined.queue, combined.nr, compare_pairs);
trace2_region_leave("merge", "directory renames", opt->repo); trace2_region_leave("merge", "directory renames", opt->repo);