mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
builtin/apply: move 'cached' global into 'struct apply_state'
To libify the apply functionality the 'cached' 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>
This commit is contained in:
parent
6ca4c39093
commit
885eefb12d
|
@ -26,6 +26,7 @@ struct apply_state {
|
|||
int prefix_length;
|
||||
|
||||
/* These control what gets looked at and modified */
|
||||
int cached; /* apply to the index only */
|
||||
int check; /* preimage must match working tree, don't actually apply */
|
||||
int check_index; /* preimage must match the indexed version */
|
||||
int update_index; /* check_index && apply */
|
||||
|
@ -42,13 +43,11 @@ struct apply_state {
|
|||
* --stat does just a diffstat, and doesn't actually apply
|
||||
* --numstat does numeric diffstat, and doesn't actually apply
|
||||
* --index-info shows the old and new index info for paths if available.
|
||||
* --cached updates only the cache without ever touching the working tree.
|
||||
*/
|
||||
static int newfd = -1;
|
||||
|
||||
static int state_p_value = 1;
|
||||
static int p_value_known;
|
||||
static int cached;
|
||||
static int diffstat;
|
||||
static int numstat;
|
||||
static int summary;
|
||||
|
@ -3264,7 +3263,7 @@ static int load_patch_target(struct apply_state *state,
|
|||
const char *name,
|
||||
unsigned expected_mode)
|
||||
{
|
||||
if (cached || state->check_index) {
|
||||
if (state->cached || state->check_index) {
|
||||
if (read_file_or_gitlink(ce, buf))
|
||||
return error(_("read of %s failed"), name);
|
||||
} else if (name) {
|
||||
|
@ -3537,7 +3536,7 @@ static int check_preimage(struct apply_state *state,
|
|||
return error(_("path %s has been renamed/deleted"), old_name);
|
||||
if (previous) {
|
||||
st_mode = previous->new_mode;
|
||||
} else if (!cached) {
|
||||
} else if (!state->cached) {
|
||||
stat_ret = lstat(old_name, st);
|
||||
if (stat_ret && errno != ENOENT)
|
||||
return error(_("%s: %s"), old_name, strerror(errno));
|
||||
|
@ -3555,9 +3554,9 @@ static int check_preimage(struct apply_state *state,
|
|||
if (checkout_target(&the_index, *ce, st))
|
||||
return -1;
|
||||
}
|
||||
if (!cached && verify_index_match(*ce, st))
|
||||
if (!state->cached && verify_index_match(*ce, st))
|
||||
return error(_("%s: does not match index"), old_name);
|
||||
if (cached)
|
||||
if (state->cached)
|
||||
st_mode = (*ce)->ce_mode;
|
||||
} else if (stat_ret < 0) {
|
||||
if (patch->is_new < 0)
|
||||
|
@ -3565,7 +3564,7 @@ static int check_preimage(struct apply_state *state,
|
|||
return error(_("%s: %s"), old_name, strerror(errno));
|
||||
}
|
||||
|
||||
if (!cached && !previous)
|
||||
if (!state->cached && !previous)
|
||||
st_mode = ce_mode_from_stat(*ce, st->st_mode);
|
||||
|
||||
if (patch->is_new < 0)
|
||||
|
@ -3603,7 +3602,7 @@ static int check_to_create(struct apply_state *state,
|
|||
cache_name_pos(new_name, strlen(new_name)) >= 0 &&
|
||||
!ok_if_exists)
|
||||
return EXISTS_IN_INDEX;
|
||||
if (cached)
|
||||
if (state->cached)
|
||||
return 0;
|
||||
|
||||
if (!lstat(new_name, &nst)) {
|
||||
|
@ -4097,7 +4096,7 @@ static void remove_file(struct apply_state *state, struct patch *patch, int rmdi
|
|||
if (remove_file_from_cache(patch->old_name) < 0)
|
||||
die(_("unable to remove %s from index"), patch->old_name);
|
||||
}
|
||||
if (!cached) {
|
||||
if (!state->cached) {
|
||||
if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) {
|
||||
remove_path(patch->old_name);
|
||||
}
|
||||
|
@ -4130,7 +4129,7 @@ static void add_index_file(struct apply_state *state,
|
|||
get_sha1_hex(s, ce->sha1))
|
||||
die(_("corrupt patch for submodule %s"), path);
|
||||
} else {
|
||||
if (!cached) {
|
||||
if (!state->cached) {
|
||||
if (lstat(path, &st) < 0)
|
||||
die_errno(_("unable to stat newly created file '%s'"),
|
||||
path);
|
||||
|
@ -4182,9 +4181,13 @@ static int try_create_file(const char *path, unsigned int mode, const char *buf,
|
|||
* which is true 99% of the time anyway. If they don't,
|
||||
* we create them and try again.
|
||||
*/
|
||||
static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
|
||||
static void create_one_file(struct apply_state *state,
|
||||
char *path,
|
||||
unsigned mode,
|
||||
const char *buf,
|
||||
unsigned long size)
|
||||
{
|
||||
if (cached)
|
||||
if (state->cached)
|
||||
return;
|
||||
if (!try_create_file(path, mode, buf, size))
|
||||
return;
|
||||
|
@ -4262,7 +4265,7 @@ static void create_file(struct apply_state *state, struct patch *patch)
|
|||
|
||||
if (!mode)
|
||||
mode = S_IFREG | 0644;
|
||||
create_one_file(path, mode, buf, size);
|
||||
create_one_file(state, path, mode, buf, size);
|
||||
|
||||
if (patch->conflicted_threeway)
|
||||
add_conflicted_stages_file(state, patch);
|
||||
|
@ -4611,7 +4614,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
|
|||
N_("instead of applying the patch, see if the patch is applicable")),
|
||||
OPT_BOOL(0, "index", &state.check_index,
|
||||
N_("make sure the patch is applicable to the current index")),
|
||||
OPT_BOOL(0, "cached", &cached,
|
||||
OPT_BOOL(0, "cached", &state.cached,
|
||||
N_("apply a patch without touching the working tree")),
|
||||
OPT_BOOL(0, "unsafe-paths", &unsafe_paths,
|
||||
N_("accept a patch that touches outside the working area")),
|
||||
|
@ -4663,7 +4666,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
|
|||
|
||||
if (state.apply_with_reject && threeway)
|
||||
die("--reject and --3way cannot be used together.");
|
||||
if (cached && threeway)
|
||||
if (state.cached && threeway)
|
||||
die("--cached and --3way cannot be used together.");
|
||||
if (threeway) {
|
||||
if (is_not_gitdir)
|
||||
|
@ -4676,7 +4679,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
|
|||
apply = 0;
|
||||
if (state.check_index && is_not_gitdir)
|
||||
die(_("--index outside a repository"));
|
||||
if (cached) {
|
||||
if (state.cached) {
|
||||
if (is_not_gitdir)
|
||||
die(_("--cached outside a repository"));
|
||||
state.check_index = 1;
|
||||
|
|
Loading…
Reference in a new issue