mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
builtin/apply: move 'check_index' global into 'struct apply_state'
To libify the apply functionality the 'check_index' 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
22a7233584
commit
ee87a6e740
|
@ -27,6 +27,7 @@ struct apply_state {
|
|||
|
||||
/* These control what gets looked at and modified */
|
||||
int check; /* preimage must match working tree, don't actually apply */
|
||||
int check_index; /* preimage must match the indexed version */
|
||||
|
||||
/* These boolean parameters control how the apply is done */
|
||||
int unidiff_zero;
|
||||
|
@ -36,14 +37,12 @@ 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.
|
||||
* --index updates the cache as well.
|
||||
* --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 check_index;
|
||||
static int update_index;
|
||||
static int cached;
|
||||
static int diffstat;
|
||||
|
@ -3245,13 +3244,14 @@ static int verify_index_match(const struct cache_entry *ce, struct stat *st)
|
|||
|
||||
#define SUBMODULE_PATCH_WITHOUT_INDEX 1
|
||||
|
||||
static int load_patch_target(struct strbuf *buf,
|
||||
static int load_patch_target(struct apply_state *state,
|
||||
struct strbuf *buf,
|
||||
const struct cache_entry *ce,
|
||||
struct stat *st,
|
||||
const char *name,
|
||||
unsigned expected_mode)
|
||||
{
|
||||
if (cached || check_index) {
|
||||
if (cached || state->check_index) {
|
||||
if (read_file_or_gitlink(ce, buf))
|
||||
return error(_("read of %s failed"), name);
|
||||
} else if (name) {
|
||||
|
@ -3277,7 +3277,8 @@ static int load_patch_target(struct strbuf *buf,
|
|||
* applying a non-git patch that incrementally updates the tree,
|
||||
* we read from the result of a previous diff.
|
||||
*/
|
||||
static int load_preimage(struct image *image,
|
||||
static int load_preimage(struct apply_state *state,
|
||||
struct image *image,
|
||||
struct patch *patch, struct stat *st,
|
||||
const struct cache_entry *ce)
|
||||
{
|
||||
|
@ -3295,7 +3296,7 @@ static int load_preimage(struct image *image,
|
|||
/* We have a patched copy in memory; use that. */
|
||||
strbuf_add(&buf, previous->result, previous->resultsize);
|
||||
} else {
|
||||
status = load_patch_target(&buf, ce, st,
|
||||
status = load_patch_target(state, &buf, ce, st,
|
||||
patch->old_name, patch->old_mode);
|
||||
if (status < 0)
|
||||
return status;
|
||||
|
@ -3354,7 +3355,9 @@ static int three_way_merge(struct image *image,
|
|||
* the current contents of the new_name. In no cases other than that
|
||||
* this function will be called.
|
||||
*/
|
||||
static int load_current(struct image *image, struct patch *patch)
|
||||
static int load_current(struct apply_state *state,
|
||||
struct image *image,
|
||||
struct patch *patch)
|
||||
{
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
int status, pos;
|
||||
|
@ -3381,7 +3384,7 @@ static int load_current(struct image *image, struct patch *patch)
|
|||
if (verify_index_match(ce, &st))
|
||||
return error(_("%s: does not match index"), name);
|
||||
|
||||
status = load_patch_target(&buf, ce, &st, name, mode);
|
||||
status = load_patch_target(state, &buf, ce, &st, name, mode);
|
||||
if (status < 0)
|
||||
return status;
|
||||
else if (status)
|
||||
|
@ -3431,11 +3434,11 @@ static int try_threeway(struct apply_state *state,
|
|||
|
||||
/* our_sha1[] is ours */
|
||||
if (patch->is_new) {
|
||||
if (load_current(&tmp_image, patch))
|
||||
if (load_current(state, &tmp_image, patch))
|
||||
return error("cannot read the current contents of '%s'",
|
||||
patch->new_name);
|
||||
} else {
|
||||
if (load_preimage(&tmp_image, patch, st, ce))
|
||||
if (load_preimage(state, &tmp_image, patch, st, ce))
|
||||
return error("cannot read the current contents of '%s'",
|
||||
patch->old_name);
|
||||
}
|
||||
|
@ -3470,7 +3473,7 @@ static int apply_data(struct apply_state *state, struct patch *patch,
|
|||
{
|
||||
struct image image;
|
||||
|
||||
if (load_preimage(&image, patch, st, ce) < 0)
|
||||
if (load_preimage(state, &image, patch, st, ce) < 0)
|
||||
return -1;
|
||||
|
||||
if (patch->direct_to_threeway ||
|
||||
|
@ -3501,7 +3504,10 @@ static int apply_data(struct apply_state *state, struct patch *patch,
|
|||
* check_patch() separately makes sure (and errors out otherwise) that
|
||||
* the path the patch creates does not exist in the current tree.
|
||||
*/
|
||||
static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)
|
||||
static int check_preimage(struct apply_state *state,
|
||||
struct patch *patch,
|
||||
struct cache_entry **ce,
|
||||
struct stat *st)
|
||||
{
|
||||
const char *old_name = patch->old_name;
|
||||
struct patch *previous = NULL;
|
||||
|
@ -3524,7 +3530,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
|
|||
return error(_("%s: %s"), old_name, strerror(errno));
|
||||
}
|
||||
|
||||
if (check_index && !previous) {
|
||||
if (state->check_index && !previous) {
|
||||
int pos = cache_name_pos(old_name, strlen(old_name));
|
||||
if (pos < 0) {
|
||||
if (patch->is_new < 0)
|
||||
|
@ -3574,11 +3580,13 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
|
|||
#define EXISTS_IN_INDEX 1
|
||||
#define EXISTS_IN_WORKTREE 2
|
||||
|
||||
static int check_to_create(const char *new_name, int ok_if_exists)
|
||||
static int check_to_create(struct apply_state *state,
|
||||
const char *new_name,
|
||||
int ok_if_exists)
|
||||
{
|
||||
struct stat nst;
|
||||
|
||||
if (check_index &&
|
||||
if (state->check_index &&
|
||||
cache_name_pos(new_name, strlen(new_name)) >= 0 &&
|
||||
!ok_if_exists)
|
||||
return EXISTS_IN_INDEX;
|
||||
|
@ -3654,7 +3662,7 @@ static void prepare_symlink_changes(struct patch *patch)
|
|||
}
|
||||
}
|
||||
|
||||
static int path_is_beyond_symlink_1(struct strbuf *name)
|
||||
static int path_is_beyond_symlink_1(struct apply_state *state, struct strbuf *name)
|
||||
{
|
||||
do {
|
||||
unsigned int change;
|
||||
|
@ -3675,7 +3683,7 @@ static int path_is_beyond_symlink_1(struct strbuf *name)
|
|||
continue;
|
||||
|
||||
/* otherwise, check the preimage */
|
||||
if (check_index) {
|
||||
if (state->check_index) {
|
||||
struct cache_entry *ce;
|
||||
|
||||
ce = cache_file_exists(name->buf, name->len, ignore_case);
|
||||
|
@ -3690,14 +3698,14 @@ static int path_is_beyond_symlink_1(struct strbuf *name)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int path_is_beyond_symlink(const char *name_)
|
||||
static int path_is_beyond_symlink(struct apply_state *state, const char *name_)
|
||||
{
|
||||
int ret;
|
||||
struct strbuf name = STRBUF_INIT;
|
||||
|
||||
assert(*name_ != '\0');
|
||||
strbuf_addstr(&name, name_);
|
||||
ret = path_is_beyond_symlink_1(&name);
|
||||
ret = path_is_beyond_symlink_1(state, &name);
|
||||
strbuf_release(&name);
|
||||
|
||||
return ret;
|
||||
|
@ -3737,7 +3745,7 @@ static int check_patch(struct apply_state *state, struct patch *patch)
|
|||
|
||||
patch->rejected = 1; /* we will drop this after we succeed */
|
||||
|
||||
status = check_preimage(patch, &ce, &st);
|
||||
status = check_preimage(state, patch, &ce, &st);
|
||||
if (status)
|
||||
return status;
|
||||
old_name = patch->old_name;
|
||||
|
@ -3764,7 +3772,7 @@ static int check_patch(struct apply_state *state, struct patch *patch)
|
|||
|
||||
if (new_name &&
|
||||
((0 < patch->is_new) || patch->is_rename || patch->is_copy)) {
|
||||
int err = check_to_create(new_name, ok_if_exists);
|
||||
int err = check_to_create(state, new_name, ok_if_exists);
|
||||
|
||||
if (err && threeway) {
|
||||
patch->direct_to_threeway = 1;
|
||||
|
@ -3819,7 +3827,7 @@ static int check_patch(struct apply_state *state, struct patch *patch)
|
|||
* is not deposited to a path that is beyond a symbolic link
|
||||
* here.
|
||||
*/
|
||||
if (!patch->is_delete && path_is_beyond_symlink(patch->new_name))
|
||||
if (!patch->is_delete && path_is_beyond_symlink(state, patch->new_name))
|
||||
return error(_("affected file '%s' is beyond a symbolic link"),
|
||||
patch->new_name);
|
||||
|
||||
|
@ -4431,11 +4439,11 @@ static int apply_patch(struct apply_state *state,
|
|||
if (whitespace_error && (ws_error_action == die_on_ws_error))
|
||||
apply = 0;
|
||||
|
||||
update_index = check_index && apply;
|
||||
update_index = state->check_index && apply;
|
||||
if (update_index && newfd < 0)
|
||||
newfd = hold_locked_index(&lock_file, 1);
|
||||
|
||||
if (check_index) {
|
||||
if (state->check_index) {
|
||||
if (read_cache() < 0)
|
||||
die(_("unable to read index file"));
|
||||
}
|
||||
|
@ -4581,7 +4589,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
|
|||
N_("instead of applying the patch, output a summary for the input")),
|
||||
OPT_BOOL(0, "check", &state.check,
|
||||
N_("instead of applying the patch, see if the patch is applicable")),
|
||||
OPT_BOOL(0, "index", &check_index,
|
||||
OPT_BOOL(0, "index", &state.check_index,
|
||||
N_("make sure the patch is applicable to the current index")),
|
||||
OPT_BOOL(0, "cached", &cached,
|
||||
N_("apply a patch without touching the working tree")),
|
||||
|
@ -4640,20 +4648,20 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
|
|||
if (threeway) {
|
||||
if (is_not_gitdir)
|
||||
die(_("--3way outside a repository"));
|
||||
check_index = 1;
|
||||
state.check_index = 1;
|
||||
}
|
||||
if (apply_with_reject)
|
||||
apply = apply_verbosely = 1;
|
||||
if (!force_apply && (diffstat || numstat || summary || state.check || fake_ancestor))
|
||||
apply = 0;
|
||||
if (check_index && is_not_gitdir)
|
||||
if (state.check_index && is_not_gitdir)
|
||||
die(_("--index outside a repository"));
|
||||
if (cached) {
|
||||
if (is_not_gitdir)
|
||||
die(_("--cached outside a repository"));
|
||||
check_index = 1;
|
||||
state.check_index = 1;
|
||||
}
|
||||
if (check_index)
|
||||
if (state.check_index)
|
||||
unsafe_paths = 0;
|
||||
|
||||
for (i = 0; i < argc; i++) {
|
||||
|
|
Loading…
Reference in a new issue