From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v3 15/19] apply: --3way with add/add conflict
Date: Wed, 13 Jun 2012 12:32:56 -0700 [thread overview]
Message-ID: <1339615980-19727-16-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1339615980-19727-1-git-send-email-gitster@pobox.com>
When a patch wants to create a path, but we already have it in our
current state, pretend as if the patch and we independently added
the same path and cause add/add conflict, so that the user can
resolve it just like "git merge" in the same situation.
For that purpose, implement load_current() in terms of the
load_patch_target() helper introduced earlier to read the current
contents from the path given by patch->new_name (patch->old_name is
NULL for a creation patch).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/apply.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 62 insertions(+), 8 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 8bc4218..c3b9f76 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -197,6 +197,7 @@ struct patch {
unsigned int is_rename:1;
unsigned int recount:1;
unsigned int conflicted_threeway:1;
+ unsigned int direct_to_threeway:1;
struct fragment *fragments;
char *result;
size_t resultsize;
@@ -3187,6 +3188,48 @@ static int three_way_merge(struct image *image,
return status;
}
+/*
+ * When directly falling back to add/add three-way merge, we read from
+ * the current contents of the new_name. In no cases other than that
+ * this function will be called.
+ */
+static int load_current(struct image *image, struct patch *patch)
+{
+ struct strbuf buf = STRBUF_INIT;
+ int status, pos;
+ size_t len;
+ char *img;
+ struct stat st;
+ struct cache_entry *ce;
+ char *name = patch->new_name;
+ unsigned mode = patch->new_mode;
+
+ if (!patch->is_new)
+ die("BUG: patch to %s is not a creation", patch->old_name);
+
+ pos = cache_name_pos(name, strlen(name));
+ if (pos < 0)
+ return error(_("%s: does not exist in index"), name);
+ ce = active_cache[pos];
+ if (lstat(name, &st)) {
+ if (errno != ENOENT)
+ return error(_("%s: %s"), name, strerror(errno));
+ if (checkout_target(ce, &st))
+ return -1;
+ }
+ if (verify_index_match(ce, &st))
+ return error(_("%s: does not match index"), name);
+
+ status = load_patch_target(&buf, ce, &st, name, mode);
+ if (status < 0)
+ return status;
+ else if (status)
+ return -1;
+ img = strbuf_detach(&buf, &len);
+ prepare_image(image, img, len, !patch->is_binary);
+ return 0;
+}
+
static int try_threeway(struct image *image, struct patch *patch,
struct stat *st, struct cache_entry *ce)
{
@@ -3198,13 +3241,15 @@ static int try_threeway(struct image *image, struct patch *patch,
struct image tmp_image;
/* No point falling back to 3-way merge in these cases */
- if (patch->is_new || patch->is_delete ||
+ if (patch->is_delete ||
S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode))
return -1;
/* Preimage the patch was prepared for */
- if (get_sha1(patch->old_sha1_prefix, pre_sha1) ||
- read_blob_object(&buf, pre_sha1, patch->old_mode))
+ if (patch->is_new)
+ write_sha1_file("", 0, blob_type, pre_sha1);
+ else if (get_sha1(patch->old_sha1_prefix, pre_sha1) ||
+ read_blob_object(&buf, pre_sha1, patch->old_mode))
return error("repository lacks the necessary blob to fall back on 3-way merge.");
fprintf(stderr, "Falling back to three-way merge...\n");
@@ -3221,9 +3266,15 @@ static int try_threeway(struct image *image, struct patch *patch,
clear_image(&tmp_image);
/* our_sha1[] is ours */
- if (load_preimage(&tmp_image, patch, st, ce))
- return error("cannot read the current contents of '%s'",
- patch->old_name);
+ if (patch->is_new) {
+ if (load_current(&tmp_image, patch))
+ return error("cannot read the current contents of '%s'",
+ patch->new_name);
+ } else {
+ if (load_preimage(&tmp_image, patch, st, ce))
+ return error("cannot read the current contents of '%s'",
+ patch->old_name);
+ }
write_sha1_file(tmp_image.buf, tmp_image.len, blob_type, our_sha1);
clear_image(&tmp_image);
@@ -3254,7 +3305,8 @@ static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *
if (load_preimage(&image, patch, st, ce) < 0)
return -1;
- if (apply_fragments(&image, patch) < 0) {
+ if (patch->direct_to_threeway ||
+ apply_fragments(&image, patch) < 0) {
/* Note: with --reject, apply_fragments() returns 0 */
if (!threeway || try_threeway(&image, patch, st, ce) < 0)
return -1;
@@ -3425,7 +3477,9 @@ static int check_patch(struct patch *patch)
((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {
int err = check_to_create(new_name, ok_if_exists);
- switch (err) {
+ if (err && threeway) {
+ patch->direct_to_threeway = 1;
+ } else switch (err) {
case 0:
break; /* happy */
case EXISTS_IN_INDEX:
--
1.7.11.rc3.30.g3bdace2
next prev parent reply other threads:[~2012-06-13 19:33 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-13 19:32 [PATCH v3 00/19] "git apply --3way" Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 01/19] apply: fix an incomplete comment in check_patch() Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 02/19] apply: a bit more comments on PATH_TO_BE_DELETED Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 03/19] apply: clear_image() clears things a bit more Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 04/19] apply: refactor read_file_or_gitlink() Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 05/19] apply: factor out checkout_target() helper function Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 06/19] apply: split load_preimage() helper function out Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 07/19] apply: refactor "previous patch" logic Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 08/19] apply: further split load_preimage() Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 09/19] apply: move check_to_create_blob() closer to its sole caller Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 10/19] apply: move "already exists" logic to check_to_create() Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 11/19] apply: accept -3/--3way command line option Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 12/19] apply: fall back on three-way merge Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 13/19] apply: plug the three-way merge logic in Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 14/19] apply: move verify_index_match() higher Junio C Hamano
2012-06-13 19:32 ` Junio C Hamano [this message]
2012-06-13 19:32 ` [PATCH v3 16/19] apply: register conflicted stages to the index Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 17/19] apply: allow rerere() upon --3way results Junio C Hamano
2012-06-13 19:32 ` [PATCH v3 18/19] apply: document --3way option Junio C Hamano
2012-06-13 19:33 ` [PATCH v3 19/19] apply --3way: tests Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339615980-19727-16-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).