From: Elijah Newren <newren@xxxxxxxxx>
We want to add an ability for users to run
git show --remerge-diff $MERGE_COMMIT
or even
git log -p --remerge-diff ...
and have git show the differences between where the merge machinery
would stop and what is recorded in merge commits. However, in such
cases, stdout is not an appropriate location to dump conflict messages.
Write those messages to a file in the merge result (not to the working
tree or index, but just to a blob recorded in the relevant tree object).
There are several considerations here:
* We have to pick file(s) where we write these conflict messages too
* We want to make it as clear as possible that it's not a real file
but a set of messages about another file
* We want conflict messages about a file to appear near the file in
question in a diff, preferably immediately preceding the file in
question
* Related to the above, per-file conflict messages are preferred
over lumping all conflict messages into one big file
To achive the above:
* We put the conflict messages for $filename in
$filename[0:-1] + " " + $filename[-1] + ".conflict_msg"
or, in words, we insert a space before the final character of
the filename and then also add ".conflict_msg" at the end.
* We start the file with a "== Conflict notices for $filename =="
banner
Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
---
merge-ort.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++-
merge-recursive.c | 3 ++
merge-recursive.h | 1 +
3 files changed, 82 insertions(+), 1 deletion(-)
diff --git a/merge-ort.c b/merge-ort.c
index 4dbf0a477af..a9e69d9cbb0 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -632,7 +632,11 @@ static void path_msg(struct merge_options *opt,
const char *fmt, ...)
{
va_list ap;
- struct strbuf *sb = strmap_get(&opt->priv->output, path);
+ struct strbuf *sb;
+
+ if (opt->record_conflict_msgs_in_tree && omittable_hint)
+ return; /* Do not record mere hints in tree */
+ sb = strmap_get(&opt->priv->output, path);
if (!sb) {
sb = xmalloc(sizeof(*sb));
strbuf_init(sb, 0);
@@ -3531,6 +3535,74 @@ static void write_completed_directory(struct merge_options *opt,
info->last_directory_len = strlen(info->last_directory);
}
+static void put_path_msgs_in_file(struct merge_options *opt,
+ const char *path,
+ struct merged_info *mi,
+ struct directory_versions *dir_metadata)
+{
+ struct strbuf tmp = STRBUF_INIT, new_path_contents = STRBUF_INIT;
+ char *new_path;
+ int new_path_basic_len, unique_counter;
+ struct merged_info *new_mi;
+ char final;
+ struct strbuf *sb = strmap_get(&opt->priv->output, path);
+
+ assert(opt->record_conflict_msgs_in_tree);
+ if (!sb)
+ return;
+
+ /*
+ * Determine a pathname for recording conflict messages. We'd like it
+ * to sort just before path, but have a name very similar to what path
+ * has.
+ */
+ strbuf_addstr(&tmp, path);
+ final = tmp.buf[tmp.len-1];
+ strbuf_setlen(&tmp, tmp.len-1);
+ strbuf_addf(&tmp, " %c.conflict_msg", final);
+
+ /*
+ * In extremely unlikely event this filename is not unique, modify it
+ * with ".<integer>" suffixes until it is.
+ */
+ new_path_basic_len = tmp.len;
+ unique_counter = 0;
+ while (strmap_contains(&opt->priv->paths, tmp.buf)) {
+ strbuf_setlen(&tmp, new_path_basic_len);
+ strbuf_addf(&tmp, ".%d", ++unique_counter);
+ }
+
+ /* Now that we have a unique string, move it to our pool */
+ new_path = mem_pool_strdup(&opt->priv->pool, tmp.buf);
+ strbuf_release(&tmp);
+
+ /* Set up contents we want to place in the file. */
+ strbuf_addf(&new_path_contents, "== Conflict notices for %s ==\n",
+ path);
+ strbuf_addbuf(&new_path_contents, sb);
+
+ /* Set up new_mi */
+ new_mi = mem_pool_calloc(&opt->priv->pool, 1, sizeof(*new_mi));
+ new_mi->result.mode = 0100644;
+ new_mi->is_null = 0;
+ new_mi->clean = 1;
+ new_mi->basename_offset = mi->basename_offset;
+ new_mi->directory_name = mi->directory_name;
+ if (write_object_file(new_path_contents.buf, new_path_contents.len,
+ blob_type, &new_mi->result.oid))
+ die(_("Unable to add %s to database"), new_path);
+
+ /*
+ * Save new_mi in opt->priv->path (so that something will deallocate
+ * it later), and record the entry for it.
+ */
+ strmap_put(&opt->priv->paths, new_path, new_mi);
+ record_entry_for_tree(dir_metadata, new_path, new_mi);
+
+ /* Cleanup */
+ strbuf_release(&new_path_contents);
+}
+
/* Per entry merge function */
static void process_entry(struct merge_options *opt,
const char *path,
@@ -3991,6 +4063,8 @@ static void process_entries(struct merge_options *opt,
struct conflict_info *ci = (struct conflict_info *)mi;
process_entry(opt, path, ci, &dir_metadata);
}
+ if (!opt->priv->call_depth && opt->record_conflict_msgs_in_tree)
+ put_path_msgs_in_file(opt, path, mi, &dir_metadata);
}
trace2_region_leave("merge", "processing", opt->repo);
@@ -4226,6 +4300,9 @@ void merge_switch_to_result(struct merge_options *opt,
struct string_list olist = STRING_LIST_INIT_NODUP;
int i;
+ if (opt->record_conflict_msgs_in_tree)
+ BUG("Either display conflict messages or record them in tree, not both");
+
trace2_region_enter("merge", "display messages", opt->repo);
/* Hack to pre-allocate olist to the desired size */
diff --git a/merge-recursive.c b/merge-recursive.c
index 3355d50e8ad..b14fa15be91 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3697,6 +3697,9 @@ static int merge_start(struct merge_options *opt, struct tree *head)
assert(opt->priv == NULL);
+ /* Not supported; option specific to merge-ort */
+ assert(!opt->record_conflict_msgs_in_tree);
+
/* Sanity check on repo state; index must match head */
if (repo_index_has_changes(opt->repo, head, &sb)) {
err(opt, _("Your local changes to the following files would be overwritten by merge:\n %s"),
diff --git a/merge-recursive.h b/merge-recursive.h
index 0795a1d3ec1..2e2fab37f46 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -46,6 +46,7 @@ struct merge_options {
/* miscellaneous control options */
const char *subtree_shift;
unsigned renormalize : 1;
+ unsigned record_conflict_msgs_in_tree : 1;
/* internal fields used by the implementation */
struct merge_options_internal *priv;
--
gitgitgadget
