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

builtin/apply: move init_apply_state() to apply.c 

To libify `git apply` functionality we must make init_apply_state()
usable outside "builtin/apply.c".

Let's do that by moving it into a new "apply.c".

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Christian Couder 9 years ago committed by Junio C Hamano
parent
f95fdc256b
commit
bb493a5c14
4 changed files with 105 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Makefile
  2. 94
      apply.c
  3. 10
      apply.h
  4. 91
      builtin/apply.c

1
Makefile
Unescape View File

@ -683,6 +683,7 @@ LIB_OBJS += abspath.o @@ -683,6 +683,7 @@ LIB_OBJS += abspath.o
LIB_OBJS += advice.o
LIB_OBJS += alias.o
LIB_OBJS += alloc.o
LIB_OBJS += apply.o
LIB_OBJS += archive.o
LIB_OBJS += archive-tar.o
LIB_OBJS += archive-zip.o

94
apply.c
Unescape View File

@ -0,0 +1,94 @@ @@ -0,0 +1,94 @@
#include "cache.h"
#include "lockfile.h"
#include "apply.h"

static void git_apply_config(void)
{
git_config_get_string_const("apply.whitespace", &apply_default_whitespace);
git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);
git_config(git_default_config, NULL);
}

int parse_whitespace_option(struct apply_state *state, const char *option)
{
if (!option) {
state->ws_error_action = warn_on_ws_error;
return 0;
}
if (!strcmp(option, "warn")) {
state->ws_error_action = warn_on_ws_error;
return 0;
}
if (!strcmp(option, "nowarn")) {
state->ws_error_action = nowarn_ws_error;
return 0;
}
if (!strcmp(option, "error")) {
state->ws_error_action = die_on_ws_error;
return 0;
}
if (!strcmp(option, "error-all")) {
state->ws_error_action = die_on_ws_error;
state->squelch_whitespace_errors = 0;
return 0;
}
if (!strcmp(option, "strip") || !strcmp(option, "fix")) {
state->ws_error_action = correct_ws_error;
return 0;
}
return error(_("unrecognized whitespace option '%s'"), option);
}

int parse_ignorewhitespace_option(struct apply_state *state,
const char *option)
{
if (!option || !strcmp(option, "no") ||
!strcmp(option, "false") || !strcmp(option, "never") ||
!strcmp(option, "none")) {
state->ws_ignore_action = ignore_ws_none;
return 0;
}
if (!strcmp(option, "change")) {
state->ws_ignore_action = ignore_ws_change;
return 0;
}
return error(_("unrecognized whitespace ignore option '%s'"), option);
}

void init_apply_state(struct apply_state *state,
const char *prefix,
struct lock_file *lock_file)
{
memset(state, 0, sizeof(*state));
state->prefix = prefix;
state->prefix_length = state->prefix ? strlen(state->prefix) : 0;
state->lock_file = lock_file;
state->newfd = -1;
state->apply = 1;
state->line_termination = '\n';
state->p_value = 1;
state->p_context = UINT_MAX;
state->squelch_whitespace_errors = 5;
state->ws_error_action = warn_on_ws_error;
state->ws_ignore_action = ignore_ws_none;
state->linenr = 1;
string_list_init(&state->fn_table, 0);
string_list_init(&state->limit_by_name, 0);
string_list_init(&state->symlink_changes, 0);
strbuf_init(&state->root, 0);

git_apply_config();
if (apply_default_whitespace && parse_whitespace_option(state, apply_default_whitespace))
exit(1);
if (apply_default_ignorewhitespace && parse_ignorewhitespace_option(state, apply_default_ignorewhitespace))
exit(1);
}

void clear_apply_state(struct apply_state *state)
{
string_list_clear(&state->limit_by_name, 0);
string_list_clear(&state->symlink_changes, 0);
strbuf_release(&state->root);

/* &state->fn_table is cleared at the end of apply_patch() */
}

10
apply.h
Unescape View File

@ -97,4 +97,14 @@ struct apply_state { @@ -97,4 +97,14 @@ struct apply_state {
int applied_after_fixing_ws;
};

extern int parse_whitespace_option(struct apply_state *state,
const char *option);
extern int parse_ignorewhitespace_option(struct apply_state *state,
const char *option);

extern void init_apply_state(struct apply_state *state,
const char *prefix,
struct lock_file *lock_file);
extern void clear_apply_state(struct apply_state *state);

#endif

91
builtin/apply.c
Unescape View File

@ -27,52 +27,6 @@ static const char * const apply_usage[] = { @@ -27,52 +27,6 @@ static const char * const apply_usage[] = {
NULL
};

static int parse_whitespace_option(struct apply_state *state, const char *option)
{
if (!option) {
state->ws_error_action = warn_on_ws_error;
return 0;
}
if (!strcmp(option, "warn")) {
state->ws_error_action = warn_on_ws_error;
return 0;
}
if (!strcmp(option, "nowarn")) {
state->ws_error_action = nowarn_ws_error;
return 0;
}
if (!strcmp(option, "error")) {
state->ws_error_action = die_on_ws_error;
return 0;
}
if (!strcmp(option, "error-all")) {
state->ws_error_action = die_on_ws_error;
state->squelch_whitespace_errors = 0;
return 0;
}
if (!strcmp(option, "strip") || !strcmp(option, "fix")) {
state->ws_error_action = correct_ws_error;
return 0;
}
return error(_("unrecognized whitespace option '%s'"), option);
}

static int parse_ignorewhitespace_option(struct apply_state *state,
const char *option)
{
if (!option || !strcmp(option, "no") ||
!strcmp(option, "false") || !strcmp(option, "never") ||
!strcmp(option, "none")) {
state->ws_ignore_action = ignore_ws_none;
return 0;
}
if (!strcmp(option, "change")) {
state->ws_ignore_action = ignore_ws_change;
return 0;
}
return error(_("unrecognized whitespace ignore option '%s'"), option);
}

static void set_default_whitespace_mode(struct apply_state *state)
{
if (!state->whitespace_option && !apply_default_whitespace)
@ -4539,13 +4493,6 @@ end: @@ -4539,13 +4493,6 @@ end:
return res;
}

static void git_apply_config(void)
{
git_config_get_string_const("apply.whitespace", &apply_default_whitespace);
git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);
git_config(git_default_config, NULL);
}

static int option_parse_exclude(const struct option *opt,
const char *arg, int unset)
{
@ -4604,44 +4551,6 @@ static int option_parse_directory(const struct option *opt, @@ -4604,44 +4551,6 @@ static int option_parse_directory(const struct option *opt,
return 0;
}

static void init_apply_state(struct apply_state *state,
const char *prefix,
struct lock_file *lock_file)
{
memset(state, 0, sizeof(*state));
state->prefix = prefix;
state->prefix_length = state->prefix ? strlen(state->prefix) : 0;
state->lock_file = lock_file;
state->newfd = -1;
state->apply = 1;
state->line_termination = '\n';
state->p_value = 1;
state->p_context = UINT_MAX;
state->squelch_whitespace_errors = 5;
state->ws_error_action = warn_on_ws_error;
state->ws_ignore_action = ignore_ws_none;
state->linenr = 1;
string_list_init(&state->fn_table, 0);
string_list_init(&state->limit_by_name, 0);
string_list_init(&state->symlink_changes, 0);
strbuf_init(&state->root, 0);

git_apply_config();
if (apply_default_whitespace && parse_whitespace_option(state, apply_default_whitespace))
exit(1);
if (apply_default_ignorewhitespace && parse_ignorewhitespace_option(state, apply_default_ignorewhitespace))
exit(1);
}

static void clear_apply_state(struct apply_state *state)
{
string_list_clear(&state->limit_by_name, 0);
string_list_clear(&state->symlink_changes, 0);
strbuf_release(&state->root);

/* &state->fn_table is cleared at the end of apply_patch() */
}

static void check_apply_state(struct apply_state *state, int force_apply)
{
int is_not_gitdir = !startup_info->have_repository;

Write Preview
Loading…
Cancel
Save