kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

builtin/apply: move 'unidiff_zero' global into 'struct apply_state' 

To libify the apply functionality the 'unidiff_zero' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Christian Couder 2016-05-24 10:10:47 +02:00 committed by Junio C Hamano
parent 6f27b941f2
commit 1da16e1ed8
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
builtin/apply.c
View File

@ -24,6 +24,9 @@
struct apply_state { struct apply_state {
const char *prefix; const char *prefix;
int prefix_length; int prefix_length;

/* These boolean parameters control how the apply is done */
int unidiff_zero;
}; };


/* /*
@ -37,7 +40,6 @@ struct apply_state {
*/ */
static int newfd = -1; static int newfd = -1;


static int unidiff_zero;
static int state_p_value = 1; static int state_p_value = 1;
static int p_value_known; static int p_value_known;
static int check_index; static int check_index;
@ -2694,7 +2696,8 @@ static void update_image(struct image *img,
* postimage) for the hunk. Find lines that match "preimage" in "img" and * postimage) for the hunk. Find lines that match "preimage" in "img" and
* replace the part of "img" with "postimage" text. * replace the part of "img" with "postimage" text.
*/ */
static int apply_one_fragment(struct image *img, struct fragment *frag, static int apply_one_fragment(struct apply_state *state,
struct image *img, struct fragment *frag,
int inaccurate_eof, unsigned ws_rule, int inaccurate_eof, unsigned ws_rule,
int nth_fragment) int nth_fragment)
{ {
@ -2836,7 +2839,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
* without leading context must match at the beginning. * without leading context must match at the beginning.
*/ */
match_beginning = (!frag->oldpos || match_beginning = (!frag->oldpos ||
(frag->oldpos == 1 && !unidiff_zero)); (frag->oldpos == 1 && !state->unidiff_zero));


/* /*
* A hunk without trailing lines must match at the end. * A hunk without trailing lines must match at the end.
@ -2844,7 +2847,7 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
* from the lack of trailing lines if the patch was generated * from the lack of trailing lines if the patch was generated
* with unidiff without any context. * with unidiff without any context.
*/ */
match_end = !unidiff_zero && !trailing; match_end = !state->unidiff_zero && !trailing;


pos = frag->newpos ? (frag->newpos - 1) : 0; pos = frag->newpos ? (frag->newpos - 1) : 0;
preimage.buf = oldlines; preimage.buf = oldlines;
@ -3067,7 +3070,7 @@ static int apply_binary(struct image *img, struct patch *patch)
return 0; return 0;
} }


static int apply_fragments(struct image *img, struct patch *patch) static int apply_fragments(struct apply_state *state, struct image *img, struct patch *patch)
{ {
struct fragment *frag = patch->fragments; struct fragment *frag = patch->fragments;
const char *name = patch->old_name ? patch->old_name : patch->new_name; const char *name = patch->old_name ? patch->old_name : patch->new_name;
@ -3080,7 +3083,7 @@ static int apply_fragments(struct image *img, struct patch *patch)


while (frag) { while (frag) {
nth++; nth++;
if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) { if (apply_one_fragment(state, img, frag, inaccurate_eof, ws_rule, nth)) {
error(_("patch failed: %s:%ld"), name, frag->oldpos); error(_("patch failed: %s:%ld"), name, frag->oldpos);
if (!apply_with_reject) if (!apply_with_reject)
return -1; return -1;
@ -3388,8 +3391,11 @@ static int load_current(struct image *image, struct patch *patch)
return 0; return 0;
} }


static int try_threeway(struct image *image, struct patch *patch, static int try_threeway(struct apply_state *state,
struct stat *st, const struct cache_entry *ce) struct image *image,
struct patch *patch,
struct stat *st,
const struct cache_entry *ce)
{ {
unsigned char pre_sha1[20], post_sha1[20], our_sha1[20]; unsigned char pre_sha1[20], post_sha1[20], our_sha1[20];
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
@ -3415,7 +3421,7 @@ static int try_threeway(struct image *image, struct patch *patch,
img = strbuf_detach(&buf, &len); img = strbuf_detach(&buf, &len);
prepare_image(&tmp_image, img, len, 1); prepare_image(&tmp_image, img, len, 1);
/* Apply the patch to get the post image */ /* Apply the patch to get the post image */
if (apply_fragments(&tmp_image, patch) < 0) { if (apply_fragments(state, &tmp_image, patch) < 0) {
clear_image(&tmp_image); clear_image(&tmp_image);
return -1; return -1;
} }
@ -3459,7 +3465,8 @@ static int try_threeway(struct image *image, struct patch *patch,
return 0; return 0;
} }


static int apply_data(struct patch *patch, struct stat *st, const struct cache_entry *ce) static int apply_data(struct apply_state *state, struct patch *patch,
struct stat *st, const struct cache_entry *ce)
{ {
struct image image; struct image image;


@ -3467,9 +3474,9 @@ static int apply_data(struct patch *patch, struct stat *st, const struct cache_e
return -1; return -1;


if (patch->direct_to_threeway || if (patch->direct_to_threeway ||
apply_fragments(&image, patch) < 0) { apply_fragments(state, &image, patch) < 0) {
/* Note: with --reject, apply_fragments() returns 0 */ /* Note: with --reject, apply_fragments() returns 0 */
if (!threeway || try_threeway(&image, patch, st, ce) < 0) if (!threeway || try_threeway(state, &image, patch, st, ce) < 0)
return -1; return -1;
} }
patch->result = image.buf; patch->result = image.buf;
@ -3717,7 +3724,7 @@ static void die_on_unsafe_path(struct patch *patch)
* Check and apply the patch in-core; leave the result in patch->result * Check and apply the patch in-core; leave the result in patch->result
* for the caller to write it out to the final destination. * for the caller to write it out to the final destination.
*/ */
static int check_patch(struct patch *patch) static int check_patch(struct apply_state *state, struct patch *patch)
{ {
struct stat st; struct stat st;
const char *old_name = patch->old_name; const char *old_name = patch->old_name;
@ -3816,13 +3823,13 @@ static int check_patch(struct patch *patch)
return error(_("affected file '%s' is beyond a symbolic link"), return error(_("affected file '%s' is beyond a symbolic link"),
patch->new_name); patch->new_name);


if (apply_data(patch, &st, ce) < 0) if (apply_data(state, patch, &st, ce) < 0)
return error(_("%s: patch does not apply"), name); return error(_("%s: patch does not apply"), name);
patch->rejected = 0; patch->rejected = 0;
return 0; return 0;
} }


static int check_patch_list(struct patch *patch) static int check_patch_list(struct apply_state *state, struct patch *patch)
{ {
int err = 0; int err = 0;


@ -3832,7 +3839,7 @@ static int check_patch_list(struct patch *patch)
if (apply_verbosely) if (apply_verbosely)
say_patch_name(stderr, say_patch_name(stderr,
_("Checking patch %s..."), patch); _("Checking patch %s..."), patch);
err |= check_patch(patch); err |= check_patch(state, patch);
patch = patch->next; patch = patch->next;
} }
return err; return err;
@ -4434,7 +4441,7 @@ static int apply_patch(struct apply_state *state,
} }


if ((check || apply) && if ((check || apply) &&
check_patch_list(list) < 0 && check_patch_list(state, list) < 0 &&
!apply_with_reject) !apply_with_reject)
exit(1); exit(1);


@ -4602,7 +4609,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
PARSE_OPT_NOARG, option_parse_space_change }, PARSE_OPT_NOARG, option_parse_space_change },
OPT_BOOL('R', "reverse", &apply_in_reverse, OPT_BOOL('R', "reverse", &apply_in_reverse,
N_("apply the patch in reverse")), N_("apply the patch in reverse")),
OPT_BOOL(0, "unidiff-zero", &unidiff_zero, OPT_BOOL(0, "unidiff-zero", &state.unidiff_zero,
N_("don't expect at least one line of context")), N_("don't expect at least one line of context")),
OPT_BOOL(0, "reject", &apply_with_reject, OPT_BOOL(0, "reject", &apply_with_reject,
N_("leave the rejected hunks in corresponding *.rej files")), N_("leave the rejected hunks in corresponding *.rej files")),