git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 3/8] apply: split load_preimage() helper function out
Date: Wed,  9 May 2012 23:02:20 -0700	[thread overview]
Message-ID: <1336629745-22436-4-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1336629745-22436-1-git-send-email-gitster@pobox.com>

The function apply_data() gets a patch for a single path, reads the
preimage in core, and applies the change represented in the patch.

Separate out the first part that reads the preimage into a separate
helper function load_preimage().

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/apply.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/builtin/apply.c b/builtin/apply.c
index cb6aad5..9f6f74f 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3025,15 +3025,10 @@ static void prepare_fn_table(struct patch *patch)
 	}
 }
 
-static int try_threeway_fallback(struct image *image, struct patch *patch)
-{
-	return -1; /* for now */
-}
-
-static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
+static int load_preimage(struct image *image,
+			 struct patch *patch, struct stat *st, struct cache_entry *ce)
 {
 	struct strbuf buf = STRBUF_INIT;
-	struct image image;
 	size_t len;
 	char *img;
 	struct patch *tpatch;
@@ -3070,7 +3065,21 @@ static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *
 	}
 
 	img = strbuf_detach(&buf, &len);
-	prepare_image(&image, img, len, !patch->is_binary);
+	prepare_image(image, img, len, !patch->is_binary);
+	return 0;
+}
+
+static int try_threeway_fallback(struct image *image, struct patch *patch)
+{
+	return -1; /* for now */
+}
+
+static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
+{
+	struct image image;
+
+	if (load_preimage(&image, patch, st, ce) < 0)
+		return -1;
 
 	if (apply_fragments(&image, patch) < 0) {
 		/* Note: with --reject, the above call succeeds. */
-- 
1.7.10.1.562.gfc79b1c

  parent reply	other threads:[~2012-05-10  6:03 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-10  6:02 [PATCH 0/8] "git apply --threeway" Junio C Hamano
2012-05-10  6:02 ` [PATCH 1/8] apply: reformat comment Junio C Hamano
2012-05-10  6:02 ` [PATCH 2/8] apply: accept --threeway command line option Junio C Hamano
2012-05-10 12:40   ` Nguyen Thai Ngoc Duy
2012-05-10 15:31     ` Junio C Hamano
2012-05-10  6:02 ` Junio C Hamano [this message]
2012-05-10  6:02 ` [PATCH 4/8] apply: clear_image() clears things a bit more Junio C Hamano
2012-05-10  6:02 ` [PATCH 5/8] apply: refactor read_file_or_gitlink() Junio C Hamano
2012-05-10  6:02 ` [PATCH 6/8] apply: fall back on three-way merge Junio C Hamano
2012-05-10  7:26   ` Matthieu Moy
2012-05-10 15:10     ` Junio C Hamano
2012-05-10 15:41       ` Matthieu Moy
2012-05-10 20:31   ` Jeff King
2012-05-10 21:06     ` Junio C Hamano
2012-05-10 22:24       ` Jeff King
2012-05-10  6:02 ` [PATCH 7/8] apply: plug the three-way merge logic in Junio C Hamano
2012-05-10  6:02 ` [PATCH 8/8] apply: register conflicted stages to the index Junio C Hamano
2012-05-10  7:31 ` [PATCH 0/8] "git apply --threeway" Matthieu Moy
2012-05-10 15:26   ` 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=1336629745-22436-4-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).