undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

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

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2016-08-08 23:03:10 +02:00 committed by Junio C Hamano
parent f36538d88b
commit b6446d54ec
3 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apply.c
View File

@ -93,3 +93,35 @@ void clear_apply_state(struct apply_state *state)
/* &state->fn_table is cleared at the end of apply_patch() */
}
int check_apply_state(struct apply_state *state, int force_apply)
{
int is_not_gitdir = !startup_info->have_repository;
if (state->apply_with_reject && state->threeway)
return error("--reject and --3way cannot be used together.");
if (state->cached && state->threeway)
return error("--cached and --3way cannot be used together.");
if (state->threeway) {
if (is_not_gitdir)
return error(_("--3way outside a repository"));
state->check_index = 1;
}
if (state->apply_with_reject)
state->apply = state->apply_verbosely = 1;
if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor))
state->apply = 0;
if (state->check_index && is_not_gitdir)
return error(_("--index outside a repository"));
if (state->cached) {
if (is_not_gitdir)
return error(_("--cached outside a repository"));
state->check_index = 1;
}
if (state->check_index)
state->unsafe_paths = 0;
if (!state->lock_file)
return error("BUG: state->lock_file should not be NULL");
return 0;
}

1
apply.h
View File

@ -106,5 +106,6 @@ extern int init_apply_state(struct apply_state *state,
const char *prefix,
struct lock_file *lock_file);
extern void clear_apply_state(struct apply_state *state);
extern int check_apply_state(struct apply_state *state, int force_apply);
#endif

32
builtin/apply.c
View File

@ -4551,38 +4551,6 @@ static int option_parse_directory(const struct option *opt,
return 0;
}
static int check_apply_state(struct apply_state *state, int force_apply)
{
int is_not_gitdir = !startup_info->have_repository;
if (state->apply_with_reject && state->threeway)
return error("--reject and --3way cannot be used together.");
if (state->cached && state->threeway)
return error("--cached and --3way cannot be used together.");
if (state->threeway) {
if (is_not_gitdir)
return error(_("--3way outside a repository"));
state->check_index = 1;
}
if (state->apply_with_reject)
state->apply = state->apply_verbosely = 1;
if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor))
state->apply = 0;
if (state->check_index && is_not_gitdir)
return error(_("--index outside a repository"));
if (state->cached) {
if (is_not_gitdir)
return error(_("--cached outside a repository"));
state->check_index = 1;
}
if (state->check_index)
state->unsafe_paths = 0;
if (!state->lock_file)
return error("BUG: state->lock_file should not be NULL");
return 0;
}
static int apply_all_patches(struct apply_state *state,
int argc,
const char **argv,