undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: shrink rename_conflict_info

Browse Source 
The rename_conflict_info struct used both a pair and a stage_data which
were taken from a rename struct.  Just use the original rename struct.
This will also allow us to start making other simplifications to the
code.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2019-04-05 08:00:18 -07:00 committed by Junio C Hamano
parent 967d6be725
commit e9cd1b5ca4
1 changed files with 50 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
merge-recursive.c
View File

@ -238,24 +238,20 @@ struct rename {
struct rename_conflict_info { struct rename_conflict_info {
enum rename_type rename_type; enum rename_type rename_type;
struct diff_filepair *pair1; struct rename *ren1;
struct diff_filepair *pair2; struct rename *ren2;
const char *branch1; const char *branch1;
const char *branch2; const char *branch2;
struct stage_data *dst_entry1;
struct stage_data *dst_entry2;
struct diff_filespec ren1_other; struct diff_filespec ren1_other;
struct diff_filespec ren2_other; struct diff_filespec ren2_other;
}; };
static inline void setup_rename_conflict_info(enum rename_type rename_type, static inline void setup_rename_conflict_info(enum rename_type rename_type,
struct diff_filepair *pair1, struct merge_options *opt,
struct diff_filepair *pair2, struct rename *ren1,
struct rename *ren2,
const char *branch1, const char *branch1,
const char *branch2, const char *branch2,
struct stage_data *dst_entry1,
struct stage_data *dst_entry2,
struct merge_options *opt,
struct stage_data *src_entry1, struct stage_data *src_entry1,
struct stage_data *src_entry2) struct stage_data *src_entry2)
{ {
@ -269,31 +265,27 @@ static inline void setup_rename_conflict_info(enum rename_type rename_type,
* ensure that branch1 == opt->branch1. So, simply flip arguments * ensure that branch1 == opt->branch1. So, simply flip arguments
* around if we don't have that. * around if we don't have that.
*/ */
if (dst_entry2 && branch1 != opt->branch1) { if (ren2 && branch1 != opt->branch1) {
setup_rename_conflict_info(rename_type, setup_rename_conflict_info(rename_type,
pair2, pair1,
branch2, branch1,
dst_entry2, dst_entry1,
opt, opt,
ren2, ren1,
branch2, branch1,
src_entry2, src_entry1); src_entry2, src_entry1);
return; return;
} }
ci = xcalloc(1, sizeof(struct rename_conflict_info)); ci = xcalloc(1, sizeof(struct rename_conflict_info));
ci->rename_type = rename_type; ci->rename_type = rename_type;
ci->pair1 = pair1; ci->ren1 = ren1;
ci->ren2 = ren2;
ci->branch1 = branch1; ci->branch1 = branch1;
ci->branch2 = branch2; ci->branch2 = branch2;
ci->dst_entry1 = dst_entry1; ci->ren1->dst_entry->processed = 0;
dst_entry1->rename_conflict_info = ci; ci->ren1->dst_entry->rename_conflict_info = ci;
dst_entry1->processed = 0;
assert(!pair2 == !dst_entry2); if (ren2) {
if (dst_entry2) { ci->ren2->dst_entry->rename_conflict_info = ci;
ci->dst_entry2 = dst_entry2;
ci->pair2 = pair2;
dst_entry2->rename_conflict_info = ci;
} }
/* /*
@ -305,7 +297,7 @@ static inline void setup_rename_conflict_info(enum rename_type rename_type,
rename_type == RENAME_TWO_FILES_TO_ONE) { rename_type == RENAME_TWO_FILES_TO_ONE) {
ostage1 = opt->branch1 == branch1 ? 3 : 2; ostage1 = opt->branch1 == branch1 ? 3 : 2;
ci->ren1_other.path = pair1->one->path; ci->ren1_other.path = ren1->pair->one->path;
oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid); oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid);
ci->ren1_other.mode = src_entry1->stages[ostage1].mode; ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
} }
@ -313,7 +305,7 @@ static inline void setup_rename_conflict_info(enum rename_type rename_type,
if (rename_type == RENAME_TWO_FILES_TO_ONE) { if (rename_type == RENAME_TWO_FILES_TO_ONE) {
ostage2 = ostage1 ^ 1; ostage2 = ostage1 ^ 1;
ci->ren2_other.path = pair2->one->path; ci->ren2_other.path = ren2->pair->one->path;
oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid); oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid);
ci->ren2_other.mode = src_entry2->stages[ostage2].mode; ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
} }
@ -1694,8 +1686,8 @@ static int handle_rename_add(struct merge_options *opt,
struct rename_conflict_info *ci) struct rename_conflict_info *ci)
{ {
/* a was renamed to c, and a separate c was added. */ /* a was renamed to c, and a separate c was added. */
struct diff_filespec *a = ci->pair1->one; struct diff_filespec *a = ci->ren1->pair->one;
struct diff_filespec *c = ci->pair1->two; struct diff_filespec *c = ci->ren1->pair->two;
char *path = c->path; char *path = c->path;
char *prev_path_desc; char *prev_path_desc;
struct merge_file_info mfi; struct merge_file_info mfi;
@ -1718,8 +1710,8 @@ static int handle_rename_add(struct merge_options *opt,
c->path, a->path, NULL, c->path, a->path, NULL,
ci->branch1, ci->branch2, ci->branch1, ci->branch2,
&mfi.oid, mfi.mode, &mfi.oid, mfi.mode,
&ci->dst_entry1->stages[other_stage].oid, &ci->ren1->dst_entry->stages[other_stage].oid,
ci->dst_entry1->stages[other_stage].mode); ci->ren1->dst_entry->stages[other_stage].mode);
} }
static char *find_path_for_conflict(struct merge_options *opt, static char *find_path_for_conflict(struct merge_options *opt,
@ -1750,9 +1742,9 @@ static int handle_rename_rename_1to2(struct merge_options *opt,
struct merge_file_info mfi; struct merge_file_info mfi;
struct diff_filespec other; struct diff_filespec other;
struct diff_filespec *add; struct diff_filespec *add;
struct diff_filespec *o = ci->pair1->one; struct diff_filespec *o = ci->ren1->pair->one;
struct diff_filespec *a = ci->pair1->two; struct diff_filespec *a = ci->ren1->pair->two;
struct diff_filespec *b = ci->pair2->two; struct diff_filespec *b = ci->ren2->pair->two;
char *path_desc; char *path_desc;
output(opt, 1, _("CONFLICT (rename/rename): " output(opt, 1, _("CONFLICT (rename/rename): "
@ -1788,14 +1780,14 @@ static int handle_rename_rename_1to2(struct merge_options *opt,
* such cases, we should keep the added file around, * such cases, we should keep the added file around,
* resolving the conflict at that path in its favor. * resolving the conflict at that path in its favor.
*/ */
add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1); add = filespec_from_entry(&other, ci->ren1->dst_entry, 2 ^ 1);
if (add) { if (add) {
if (update_file(opt, 0, &add->oid, add->mode, a->path)) if (update_file(opt, 0, &add->oid, add->mode, a->path))
return -1; return -1;
} }
else else
remove_file_from_index(opt->repo->index, a->path); remove_file_from_index(opt->repo->index, a->path);
add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1); add = filespec_from_entry(&other, ci->ren2->dst_entry, 3 ^ 1);
if (add) { if (add) {
if (update_file(opt, 0, &add->oid, add->mode, b->path)) if (update_file(opt, 0, &add->oid, add->mode, b->path))
return -1; return -1;
@ -1808,7 +1800,7 @@ static int handle_rename_rename_1to2(struct merge_options *opt,
* rename/add collision. If not, we can write the file out * rename/add collision. If not, we can write the file out
* to the specified location. * to the specified location.
*/ */
add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1); add = filespec_from_entry(&other, ci->ren1->dst_entry, 2 ^ 1);
if (add) { if (add) {
if (handle_file_collision(opt, a->path, if (handle_file_collision(opt, a->path,
NULL, NULL, NULL, NULL,
@ -1827,7 +1819,7 @@ static int handle_rename_rename_1to2(struct merge_options *opt,
return -1; return -1;
} }
add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1); add = filespec_from_entry(&other, ci->ren2->dst_entry, 3 ^ 1);
if (add) { if (add) {
if (handle_file_collision(opt, b->path, if (handle_file_collision(opt, b->path,
NULL, NULL, NULL, NULL,
@ -1854,10 +1846,10 @@ static int handle_rename_rename_2to1(struct merge_options *opt,
struct rename_conflict_info *ci) struct rename_conflict_info *ci)
{ {
/* Two files, a & b, were renamed to the same thing, c. */ /* Two files, a & b, were renamed to the same thing, c. */
struct diff_filespec *a = ci->pair1->one; struct diff_filespec *a = ci->ren1->pair->one;
struct diff_filespec *b = ci->pair2->one; struct diff_filespec *b = ci->ren2->pair->one;
struct diff_filespec *c1 = ci->pair1->two; struct diff_filespec *c1 = ci->ren1->pair->two;
struct diff_filespec *c2 = ci->pair2->two; struct diff_filespec *c2 = ci->ren2->pair->two;
char *path = c1->path; /* == c2->path */ char *path = c1->path; /* == c2->path */
char *path_side_1_desc; char *path_side_1_desc;
char *path_side_2_desc; char *path_side_2_desc;
@ -2732,13 +2724,11 @@ static int process_renames(struct merge_options *opt,
ren2->pair->two); ren2->pair->two);
} }
setup_rename_conflict_info(rename_type, setup_rename_conflict_info(rename_type,
ren1->pair, opt,
ren2->pair, ren1,
ren2,
branch1, branch1,
branch2, branch2,
ren1->dst_entry,
ren2->dst_entry,
opt,
NULL, NULL,
NULL); NULL);
} else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) { } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
@ -2759,13 +2749,11 @@ static int process_renames(struct merge_options *opt,
ren2->src_entry->processed = 1; ren2->src_entry->processed = 1;
setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE, setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
ren1->pair, opt,
ren2->pair, ren1,
ren2,
branch1, branch1,
branch2, branch2,
ren1->dst_entry,
ren2->dst_entry,
opt,
ren1->src_entry, ren1->src_entry,
ren2->src_entry); ren2->src_entry);
@ -2802,24 +2790,20 @@ static int process_renames(struct merge_options *opt,
if (oid_eq(&src_other.oid, &null_oid) && if (oid_eq(&src_other.oid, &null_oid) &&
ren1->add_turned_into_rename) { ren1->add_turned_into_rename) {
setup_rename_conflict_info(RENAME_VIA_DIR, setup_rename_conflict_info(RENAME_VIA_DIR,
ren1->pair, opt,
ren1,
NULL, NULL,
branch1, branch1,
branch2, branch2,
ren1->dst_entry,
NULL,
opt,
NULL, NULL,
NULL); NULL);
} else if (oid_eq(&src_other.oid, &null_oid)) { } else if (oid_eq(&src_other.oid, &null_oid)) {
setup_rename_conflict_info(RENAME_DELETE, setup_rename_conflict_info(RENAME_DELETE,
ren1->pair, opt,
ren1,
NULL, NULL,
branch1, branch1,
branch2, branch2,
ren1->dst_entry,
NULL,
opt,
NULL, NULL,
NULL); NULL);
} else if ((dst_other.mode == ren1->pair->two->mode) && } else if ((dst_other.mode == ren1->pair->two->mode) &&
@ -2848,13 +2832,11 @@ static int process_renames(struct merge_options *opt,
* file, then the merge will be clean. * file, then the merge will be clean.
*/ */
setup_rename_conflict_info(RENAME_ADD, setup_rename_conflict_info(RENAME_ADD,
ren1->pair, opt,
ren1,
NULL, NULL,
branch1, branch1,
branch2, branch2,
ren1->dst_entry,
NULL,
opt,
ren1->src_entry, ren1->src_entry,
NULL); NULL);
} else } else
@ -2876,13 +2858,11 @@ static int process_renames(struct merge_options *opt,
} }
update_entry(ren1->dst_entry, o, a, b); update_entry(ren1->dst_entry, o, a, b);
setup_rename_conflict_info(RENAME_NORMAL, setup_rename_conflict_info(RENAME_NORMAL,
ren1->pair, opt,
ren1,
NULL, NULL,
branch1, branch1,
NULL, NULL,
ren1->dst_entry,
NULL,
opt,
NULL, NULL,
NULL); NULL);
} }
@ -3119,15 +3099,15 @@ static int handle_content_merge(struct merge_options *opt,
b.mode = b_mode; b.mode = b_mode;
if (ci) { if (ci) {
struct diff_filepair *pair1 = ci->pair1; struct diff_filepair *pair1 = ci->ren1->pair;
path1 = (opt->branch1 == ci->branch1) ? path1 = (opt->branch1 == ci->branch1) ?
pair1->two->path : pair1->one->path; pair1->two->path : pair1->one->path;
/* If ci->pair2 != NULL, we are in /* If ci->ren2->pair != NULL, we are in
* RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
* normal rename. * normal rename.
*/ */
path2 = (ci->pair2 || path2 = ((ci->ren2 && ci->ren2->pair) ||
opt->branch2 == ci->branch1) ? opt->branch2 == ci->branch1) ?
pair1->two->path : pair1->one->path; pair1->two->path : pair1->one->path;
one.path = pair1->one->path; one.path = pair1->one->path;
@ -3264,7 +3244,7 @@ static int process_entry(struct merge_options *opt,
break; break;
case RENAME_VIA_DIR: case RENAME_VIA_DIR:
clean_merge = 1; clean_merge = 1;
if (handle_rename_via_dir(opt, ci->pair1, ci->branch1)) if (handle_rename_via_dir(opt, ci->ren1->pair, ci->branch1))
clean_merge = -1; clean_merge = -1;
break; break;
case RENAME_ADD: case RENAME_ADD:
@ -3278,7 +3258,7 @@ static int process_entry(struct merge_options *opt,
break; break;
case RENAME_DELETE: case RENAME_DELETE:
clean_merge = 0; clean_merge = 0;
if (handle_rename_delete(opt, ci->pair1, if (handle_rename_delete(opt, ci->ren1->pair,
ci->branch1, ci->branch2)) ci->branch1, ci->branch2))
clean_merge = -1; clean_merge = -1;
break; break;