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

merge-ort: optionally produce machine-readable output

Browse Source 
With the new `detailed` parameter, a new mode can be triggered when
displaying the merge messages: The `detailed` mode prints NUL-delimited
fields of the following form:

	<path-count> NUL <path>... NUL <conflict-type> NUL <message>

The `<path-count>` field determines how many `<path>` fields there are.

The intention of this mode is to support server-side operations, where
worktree-less merges can lead to conflicts and depending on the type
and/or path count, the caller might know how to handle said conflict.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2022-06-18 00:20:57 +00:00 committed by Junio C Hamano
parent cb2607759e
commit de90581141
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/merge-tree.c
View File

@ -468,7 +468,8 @@ static int real_merge(struct merge_tree_options *o,
} }
if (o->show_messages) { if (o->show_messages) {
putchar(line_termination); putchar(line_termination);
merge_display_update_messages(&opt, &result); merge_display_update_messages(&opt, line_termination == '\0',
&result);
} }
merge_finalize(&opt, &result); merge_finalize(&opt, &result);
return !result.clean; /* result.clean < 0 handled above */ return !result.clean; /* result.clean < 0 handled above */

22
merge-ort.c
View File

@ -4413,6 +4413,7 @@ static int record_conflicted_index_entries(struct merge_options *opt)
} }
void merge_display_update_messages(struct merge_options *opt, void merge_display_update_messages(struct merge_options *opt,
int detailed,
struct merge_result *result) struct merge_result *result)
{ {
struct merge_options_internal *opti = result->priv; struct merge_options_internal *opti = result->priv;
@ -4438,8 +4439,25 @@ void merge_display_update_messages(struct merge_options *opt,
/* Iterate over the items, printing them */ /* Iterate over the items, printing them */
for (int path_nr = 0; path_nr < olist.nr; ++path_nr) { for (int path_nr = 0; path_nr < olist.nr; ++path_nr) {
struct string_list *conflicts = olist.items[path_nr].util; struct string_list *conflicts = olist.items[path_nr].util;
for (int i = 0; i < conflicts->nr; i++) for (int i = 0; i < conflicts->nr; i++) {
struct logical_conflict_info *info =
conflicts->items[i].util;
if (detailed) {
printf("%lu", (unsigned long)info->paths.nr);
putchar('\0');
for (int n = 0; n < info->paths.nr; n++) {
fputs(info->paths.v[n], stdout);
putchar('\0');
}
fputs(type_short_descriptions[info->type],
stdout);
putchar('\0');
}
puts(conflicts->items[i].string); puts(conflicts->items[i].string);
if (detailed)
putchar('\0');
}
} }
string_list_clear(&olist, 0); string_list_clear(&olist, 0);
@ -4519,7 +4537,7 @@ void merge_switch_to_result(struct merge_options *opt,
trace2_region_leave("merge", "write_auto_merge", opt->repo); trace2_region_leave("merge", "write_auto_merge", opt->repo);
} }
if (display_update_msgs) if (display_update_msgs)
merge_display_update_messages(opt, result); merge_display_update_messages(opt, /* detailed */ 0, result);
merge_finalize(opt, result); merge_finalize(opt, result);
} }

1
merge-ort.h
View File

@ -87,6 +87,7 @@ void merge_switch_to_result(struct merge_options *opt,
* so only call this when bypassing merge_switch_to_result(). * so only call this when bypassing merge_switch_to_result().
*/ */
void merge_display_update_messages(struct merge_options *opt, void merge_display_update_messages(struct merge_options *opt,
int detailed,
struct merge_result *result); struct merge_result *result);
struct stage_info { struct stage_info {