kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'en/merge-recursive-cleanup' 

Code cleanup.

* en/merge-recursive-cleanup:
  merge-recursive: add pointer about unduly complex looking code
  merge-recursive: rename conflict_rename_*() family of functions
  merge-recursive: clarify the rename_dir/RENAME_DIR meaning
  merge-recursive: align labels with their respective code blocks
  merge-recursive: fix numerous argument alignment issues
  merge-recursive: fix miscellaneous grammar error in comment
maint
Junio C Hamano 2018-07-18 12:20:27 -07:00
parent e3331758f1 5b26c3c941
commit 473b8bb3aa
1 changed files with 104 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
merge-recursive.c
View File

@ -182,7 +182,7 @@ static int oid_eq(const struct object_id *a, const struct object_id *b)


enum rename_type { enum rename_type {
RENAME_NORMAL = 0, RENAME_NORMAL = 0,
RENAME_DIR, RENAME_VIA_DIR,
RENAME_DELETE, RENAME_DELETE,
RENAME_ONE_FILE_TO_ONE, RENAME_ONE_FILE_TO_ONE,
RENAME_ONE_FILE_TO_TWO, RENAME_ONE_FILE_TO_TWO,
@ -312,8 +312,8 @@ static void output_commit_title(struct merge_options *o, struct commit *commit)
} }


static int add_cacheinfo(struct merge_options *o, static int add_cacheinfo(struct merge_options *o,
unsigned int mode, const struct object_id *oid, unsigned int mode, const struct object_id *oid,
const char *path, int stage, int refresh, int options) const char *path, int stage, int refresh, int options)
{ {
struct cache_entry *ce; struct cache_entry *ce;
int ret; int ret;
@ -420,8 +420,8 @@ struct tree *write_tree_from_memory(struct merge_options *o)
} }


static int save_files_dirs(const struct object_id *oid, static int save_files_dirs(const struct object_id *oid,
struct strbuf *base, const char *path, struct strbuf *base, const char *path,
unsigned int mode, int stage, void *context) unsigned int mode, int stage, void *context)
{ {
struct path_hashmap_entry *entry; struct path_hashmap_entry *entry;
int baselen = base->len; int baselen = base->len;
@ -542,7 +542,7 @@ static void record_df_conflict_files(struct merge_options *o,
struct string_list *entries) struct string_list *entries)
{ {
/* If there is a D/F conflict and the file for such a conflict /* If there is a D/F conflict and the file for such a conflict
* currently exist in the working tree, we want to allow it to be * currently exists in the working tree, we want to allow it to be
* removed to make room for the corresponding directory if needed. * removed to make room for the corresponding directory if needed.
* The files underneath the directories of such D/F conflicts will * The files underneath the directories of such D/F conflicts will
* be processed before the corresponding file involved in the D/F * be processed before the corresponding file involved in the D/F
@ -916,7 +916,7 @@ static int make_room_for_path(struct merge_options *o, const char *path)
*/ */
if (would_lose_untracked(path)) if (would_lose_untracked(path))
return err(o, _("refusing to lose untracked file at '%s'"), return err(o, _("refusing to lose untracked file at '%s'"),
path); path);


/* Successful unlink is good.. */ /* Successful unlink is good.. */
if (!unlink(path)) if (!unlink(path))
@ -995,16 +995,16 @@ static int update_file_flags(struct merge_options *o,
unlink(path); unlink(path);
if (symlink(lnk, path)) if (symlink(lnk, path))
ret = err(o, _("failed to symlink '%s': %s"), ret = err(o, _("failed to symlink '%s': %s"),
path, strerror(errno)); path, strerror(errno));
free(lnk); free(lnk);
} else } else
ret = err(o, ret = err(o,
_("do not know what to do with %06o %s '%s'"), _("do not know what to do with %06o %s '%s'"),
mode, oid_to_hex(oid), path); mode, oid_to_hex(oid), path);
free_buf: free_buf:
free(buf); free(buf);
} }
update_index: update_index:
if (!ret && update_cache) if (!ret && update_cache)
if (add_cacheinfo(o, mode, oid, path, 0, update_wd, if (add_cacheinfo(o, mode, oid, path, 0, update_wd,
ADD_CACHE_OK_TO_ADD)) ADD_CACHE_OK_TO_ADD))
@ -1093,7 +1093,7 @@ static int merge_3way(struct merge_options *o,
} }


static int find_first_merges(struct object_array *result, const char *path, static int find_first_merges(struct object_array *result, const char *path,
struct commit *a, struct commit *b) struct commit *a, struct commit *b)
{ {
int i, j; int i, j;
struct object_array merges = OBJECT_ARRAY_INIT; struct object_array merges = OBJECT_ARRAY_INIT;
@ -1111,7 +1111,7 @@ static int find_first_merges(struct object_array *result, const char *path,


/* get all revisions that merge commit a */ /* get all revisions that merge commit a */
xsnprintf(merged_revision, sizeof(merged_revision), "^%s", xsnprintf(merged_revision, sizeof(merged_revision), "^%s",
oid_to_hex(&a->object.oid)); oid_to_hex(&a->object.oid));
init_revisions(&revs, NULL); init_revisions(&revs, NULL);
rev_opts.submodule = path; rev_opts.submodule = path;
/* FIXME: can't handle linked worktrees in submodules yet */ /* FIXME: can't handle linked worktrees in submodules yet */
@ -1253,12 +1253,12 @@ static int merge_submodule(struct merge_options *o,
output(o, 2, _("Found a possible merge resolution for the submodule:\n")); output(o, 2, _("Found a possible merge resolution for the submodule:\n"));
print_commit((struct commit *) merges.objects[0].item); print_commit((struct commit *) merges.objects[0].item);
output(o, 2, _( output(o, 2, _(
"If this is correct simply add it to the index " "If this is correct simply add it to the index "
"for example\n" "for example\n"
"by using:\n\n" "by using:\n\n"
" git update-index --cacheinfo 160000 %s \"%s\"\n\n" " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
"which will accept this suggestion.\n"), "which will accept this suggestion.\n"),
oid_to_hex(&merges.objects[0].item->oid), path); oid_to_hex(&merges.objects[0].item->oid), path);
break; break;


default: default:
@ -1335,10 +1335,10 @@ static int merge_file_1(struct merge_options *o,
result->clean = (merge_status == 0); result->clean = (merge_status == 0);
} else if (S_ISGITLINK(a->mode)) { } else if (S_ISGITLINK(a->mode)) {
result->clean = merge_submodule(o, &result->oid, result->clean = merge_submodule(o, &result->oid,
one->path, one->path,
&one->oid, &one->oid,
&a->oid, &a->oid,
&b->oid); &b->oid);
} else if (S_ISLNK(a->mode)) { } else if (S_ISLNK(a->mode)) {
switch (o->recursive_variant) { switch (o->recursive_variant) {
case MERGE_RECURSIVE_NORMAL: case MERGE_RECURSIVE_NORMAL:
@ -1413,11 +1413,17 @@ static int merge_file_one(struct merge_options *o,
return merge_file_1(o, &one, &a, &b, path, branch1, branch2, mfi); return merge_file_1(o, &one, &a, &b, path, branch1, branch2, mfi);
} }


static int conflict_rename_dir(struct merge_options *o, static int handle_rename_via_dir(struct merge_options *o,
struct diff_filepair *pair, struct diff_filepair *pair,
const char *rename_branch, const char *rename_branch,
const char *other_branch) const char *other_branch)
{ {
/*
* Handle file adds that need to be renamed due to directory rename
* detection. This differs from handle_rename_normal, because
* there is no content merge to do; just move the file into the
* desired final location.
*/
const struct diff_filespec *dest = pair->two; const struct diff_filespec *dest = pair->two;


if (!o->call_depth && would_lose_untracked(dest->path)) { if (!o->call_depth && would_lose_untracked(dest->path)) {
@ -1446,13 +1452,13 @@ static int conflict_rename_dir(struct merge_options *o,
} }


static int handle_change_delete(struct merge_options *o, static int handle_change_delete(struct merge_options *o,
const char *path, const char *old_path, const char *path, const char *old_path,
const struct object_id *o_oid, int o_mode, const struct object_id *o_oid, int o_mode,
const struct object_id *changed_oid, const struct object_id *changed_oid,
int changed_mode, int changed_mode,
const char *change_branch, const char *change_branch,
const char *delete_branch, const char *delete_branch,
const char *change, const char *change_past) const char *change, const char *change_past)
{ {
char *alt_path = NULL; char *alt_path = NULL;
const char *update_path = path; const char *update_path = path;
@ -1473,6 +1479,21 @@ static int handle_change_delete(struct merge_options *o,
if (!ret) if (!ret)
ret = update_file(o, 0, o_oid, o_mode, update_path); ret = update_file(o, 0, o_oid, o_mode, update_path);
} else { } else {
/*
* Despite the four nearly duplicate messages and argument
* lists below and the ugliness of the nested if-statements,
* having complete messages makes the job easier for
* translators.
*
* The slight variance among the cases is due to the fact
* that:
* 1) directory/file conflicts (in effect if
* !alt_path) could cause us to need to write the
* file to a different path.
* 2) renames (in effect if !old_path) could mean that
* there are two names for the path that the user
* may know the file by.
*/
if (!alt_path) { if (!alt_path) {
if (!old_path) { if (!old_path) {
output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
@ -1512,10 +1533,10 @@ static int handle_change_delete(struct merge_options *o,
return ret; return ret;
} }


static int conflict_rename_delete(struct merge_options *o, static int handle_rename_delete(struct merge_options *o,
struct diff_filepair *pair, struct diff_filepair *pair,
const char *rename_branch, const char *rename_branch,
const char *delete_branch) const char *delete_branch)
{ {
const struct diff_filespec *orig = pair->one; const struct diff_filespec *orig = pair->one;
const struct diff_filespec *dest = pair->two; const struct diff_filespec *dest = pair->two;
@ -1617,8 +1638,8 @@ static int handle_file(struct merge_options *o,
return ret; return ret;
} }


static int conflict_rename_rename_1to2(struct merge_options *o, static int handle_rename_rename_1to2(struct merge_options *o,
struct rename_conflict_info *ci) struct rename_conflict_info *ci)
{ {
/* One file was renamed in both branches, but to different names. */ /* One file was renamed in both branches, but to different names. */
struct diff_filespec *one = ci->pair1->one; struct diff_filespec *one = ci->pair1->one;
@ -1679,8 +1700,8 @@ static int conflict_rename_rename_1to2(struct merge_options *o,
return 0; return 0;
} }


static int conflict_rename_rename_2to1(struct merge_options *o, static int handle_rename_rename_2to1(struct merge_options *o,
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->pair1->one;
@ -2422,7 +2443,7 @@ static void apply_directory_rename_modifications(struct merge_options *o,
* "NOTE" in update_stages(), doing so will modify the current * "NOTE" in update_stages(), doing so will modify the current
* in-memory index which will break calls to would_lose_untracked() * in-memory index which will break calls to would_lose_untracked()
* that we need to make. Instead, we need to just make sure that * that we need to make. Instead, we need to just make sure that
* the various conflict_rename_*() functions update the index * the various handle_rename_*() functions update the index
* explicitly rather than relying on unpack_trees() to have done it. * explicitly rather than relying on unpack_trees() to have done it.
*/ */
get_tree_entry(&tree->object.oid, get_tree_entry(&tree->object.oid,
@ -2695,7 +2716,7 @@ static int process_renames(struct merge_options *o,


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_DIR, setup_rename_conflict_info(RENAME_VIA_DIR,
ren1->pair, ren1->pair,
NULL, NULL,
branch1, branch1,
@ -2826,12 +2847,12 @@ static void initial_cleanup_rename(struct diff_queue_struct *pairs,
free(pairs); free(pairs);
} }


static int handle_renames(struct merge_options *o, static int detect_and_process_renames(struct merge_options *o,
struct tree *common, struct tree *common,
struct tree *head, struct tree *head,
struct tree *merge, struct tree *merge,
struct string_list *entries, struct string_list *entries,
struct rename_info *ri) struct rename_info *ri)
{ {
struct diff_queue_struct *head_pairs, *merge_pairs; struct diff_queue_struct *head_pairs, *merge_pairs;
struct hashmap *dir_re_head, *dir_re_merge; struct hashmap *dir_re_head, *dir_re_merge;
@ -2907,7 +2928,8 @@ static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
} }


static int read_oid_strbuf(struct merge_options *o, static int read_oid_strbuf(struct merge_options *o,
const struct object_id *oid, struct strbuf *dst) const struct object_id *oid,
struct strbuf *dst)
{ {
void *buf; void *buf;
enum object_type type; enum object_type type;
@ -2960,10 +2982,10 @@ error_return:
} }


static int handle_modify_delete(struct merge_options *o, static int handle_modify_delete(struct merge_options *o,
const char *path, const char *path,
struct object_id *o_oid, int o_mode, struct object_id *o_oid, int o_mode,
struct object_id *a_oid, int a_mode, struct object_id *a_oid, int a_mode,
struct object_id *b_oid, int b_mode) struct object_id *b_oid, int b_mode)
{ {
const char *modify_branch, *delete_branch; const char *modify_branch, *delete_branch;
struct object_id *changed_oid; struct object_id *changed_oid;
@ -3101,12 +3123,12 @@ static int merge_content(struct merge_options *o,
return !is_dirty && mfi.clean; return !is_dirty && mfi.clean;
} }


static int conflict_rename_normal(struct merge_options *o, static int handle_rename_normal(struct merge_options *o,
const char *path, const char *path,
struct object_id *o_oid, unsigned int o_mode, struct object_id *o_oid, unsigned int o_mode,
struct object_id *a_oid, unsigned int a_mode, struct object_id *a_oid, unsigned int a_mode,
struct object_id *b_oid, unsigned int b_mode, struct object_id *b_oid, unsigned int b_mode,
struct rename_conflict_info *ci) struct rename_conflict_info *ci)
{ {
/* Merge the content and write it out */ /* Merge the content and write it out */
return merge_content(o, path, was_dirty(o, path), return merge_content(o, path, was_dirty(o, path),
@ -3133,37 +3155,37 @@ static int process_entry(struct merge_options *o,
switch (conflict_info->rename_type) { switch (conflict_info->rename_type) {
case RENAME_NORMAL: case RENAME_NORMAL:
case RENAME_ONE_FILE_TO_ONE: case RENAME_ONE_FILE_TO_ONE:
clean_merge = conflict_rename_normal(o, clean_merge = handle_rename_normal(o,
path, path,
o_oid, o_mode, o_oid, o_mode,
a_oid, a_mode, a_oid, a_mode,
b_oid, b_mode, b_oid, b_mode,
conflict_info); conflict_info);
break; break;
case RENAME_DIR: case RENAME_VIA_DIR:
clean_merge = 1; clean_merge = 1;
if (conflict_rename_dir(o, if (handle_rename_via_dir(o,
conflict_info->pair1, conflict_info->pair1,
conflict_info->branch1, conflict_info->branch1,
conflict_info->branch2)) conflict_info->branch2))
clean_merge = -1; clean_merge = -1;
break; break;
case RENAME_DELETE: case RENAME_DELETE:
clean_merge = 0; clean_merge = 0;
if (conflict_rename_delete(o, if (handle_rename_delete(o,
conflict_info->pair1, conflict_info->pair1,
conflict_info->branch1, conflict_info->branch1,
conflict_info->branch2)) conflict_info->branch2))
clean_merge = -1; clean_merge = -1;
break; break;
case RENAME_ONE_FILE_TO_TWO: case RENAME_ONE_FILE_TO_TWO:
clean_merge = 0; clean_merge = 0;
if (conflict_rename_rename_1to2(o, conflict_info)) if (handle_rename_rename_1to2(o, conflict_info))
clean_merge = -1; clean_merge = -1;
break; break;
case RENAME_TWO_FILES_TO_ONE: case RENAME_TWO_FILES_TO_ONE:
clean_merge = 0; clean_merge = 0;
if (conflict_rename_rename_2to1(o, conflict_info)) if (handle_rename_rename_2to1(o, conflict_info))
clean_merge = -1; clean_merge = -1;
break; break;
default: default:
@ -3303,8 +3325,8 @@ int merge_trees(struct merge_options *o,
get_files_dirs(o, merge); get_files_dirs(o, merge);


entries = get_unmerged(); entries = get_unmerged();
clean = handle_renames(o, common, head, merge, entries, clean = detect_and_process_renames(o, common, head, merge,
&re_info); entries, &re_info);
record_df_conflict_files(o, entries); record_df_conflict_files(o, entries);
if (clean < 0) if (clean < 0)
goto cleanup; goto cleanup;
@ -3328,7 +3350,7 @@ int merge_trees(struct merge_options *o,
entries->items[i].string); entries->items[i].string);
} }


cleanup: cleanup:
final_cleanup_renames(&re_info); final_cleanup_renames(&re_info);


string_list_clear(entries, 1); string_list_clear(entries, 1);
@ -3496,14 +3518,14 @@ int merge_recursive_generic(struct merge_options *o,
struct commit *base; struct commit *base;
if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i])))) if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i]))))
return err(o, _("Could not parse object '%s'"), return err(o, _("Could not parse object '%s'"),
oid_to_hex(base_list[i])); oid_to_hex(base_list[i]));
commit_list_insert(base, &ca); commit_list_insert(base, &ca);
} }
} }


hold_locked_index(&lock, LOCK_DIE_ON_ERROR); hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
clean = merge_recursive(o, head_commit, next_commit, ca, clean = merge_recursive(o, head_commit, next_commit, ca,
result); result);
if (clean < 0) { if (clean < 0) {
rollback_lock_file(&lock); rollback_lock_file(&lock);
return clean; return clean;