[PATCH v2 11/11] rerere: adjust 'forget' to multi-variant world order
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 28, 2016, 22:42 UTC
- Message-ID
- <1459204942-26601-12-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1459204942-26601-1-git-send-email-gitster@pobox.com>
Because conflicts with the same contents inside conflict blocks enclosed by "<<<<<<<" and ">>>>>>>" can now have multiple variants to help three-way merge to adjust to the differences outside the conflict blocks, "rerere forget $path" needs to be taught that there may be multiple recorded resolutions that share the same conflict hash (which groups the conflicts with "the same contents inside conflict blocks"), among which there are some that would not be relevant to the conflict we are looking at. These "other variants" that happen to share the same conflict hash should not be cleared, and the variant that would apply to the current conflict may not be the zero-th one (which is the only one that is cleared by the current code).
After finding the conflict hash, iterate over the existing variants and try to resolve the conflict using each of them to find the one that "cleanly" resolves the current conflict. That is the one we want to forget and record the preimage for, so that the user can record the corrected resolution.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- * New in v2. I _think_ we should refactor the code further in order to avoid rewriting "thisimage", "thisimage.1", etc. on the filesystem (instead, teach handle_path() to output to an in-core buffer and keep it around during this loop), and doing the same handle_cache() over and over again, but for now this should do.
rerere.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/rerere.c b/rerere.c index e636d4b..1693866 100644 --- a/rerere.c +++ b/rerere.c @@ -1038,7 +1038,33 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr) /* Nuke the recorded resolution for the conflict */ id = new_rerere_id(sha1); - id->variant = 0; /* for now */ + + for (id->variant = 0; + id->variant < id->collection->status_nr; + id->variant++) { + mmfile_t cur = { NULL, 0 }; + mmbuffer_t result = {NULL, 0}; + int cleanly_resolved; + + if (!has_rerere_resolution(id)) + continue; + + handle_cache(path, sha1, rerere_path(id, "thisimage")); + if (read_mmfile(&cur, rerere_path(id, "thisimage"))) { + free(cur.ptr); + return error("Failed to update conflicted state in '%s'", + path); + } + cleanly_resolved = !try_merge(id, path, &cur, &result); + free(result.ptr); + free(cur.ptr); + if (cleanly_resolved) + break; + } + + if (id->collection->status_nr <= id->variant) + return error("no remembered resolution for '%s'", path); + filename = rerere_path(id, "postimage"); if (unlink(filename)) return (errno == ENOENT
-- 2.8.0-215-g046a488