git/apply.h, branch v2.14.2

apply: remove prefix_length member from apply_state

2017-08-09T17:21:45Z

Use a NULL-and-NUL check to see if we have a prefix and consistently use C string functions on it instead of storing its length in a member of struct apply_state. This avoids strlen() calls and simplifies the code. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

apply: learn to use a different index file

2016-09-07T19:29:54Z

Sometimes we want to apply in a different index file. Before the apply functionality was libified it was possible to use the GIT_INDEX_FILE environment variable, for this purpose. But now, as the apply functionality has been libified, it should be possible to do that in a libified way. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

apply: refactor `git apply` option parsing

2016-09-07T19:29:53Z

Parsing `git apply` options can be useful to other commands that want to call the libified apply functionality, because this way they can easily pass some options from their own command line to the libified apply functionality. This will be used by `git am` in a following patch. To make this possible, let's refactor the `git apply` option parsing code into a new libified apply_parse_options() function. Doing that makes it possible to remove some functions definitions from "apply.h" and make them static in "apply.c". Helped-by: Ramsay Jones Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

apply: change error_routine when silent

2016-09-07T19:29:53Z

To avoid printing anything when applying with `state->apply_verbosity == verbosity_silent`, let's save the existing warn and error routines before applying, and let's replace them with a routine that does nothing. Then after applying, let's restore the saved routines. Note that, as we need to restore the saved routines in all cases, we cannot return early any more in apply_all_patches(). Helped-by: Stefan Beller Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

apply: make it possible to silently apply

2016-09-07T19:29:53Z

This changes 'int apply_verbosely' into 'enum apply_verbosity', and changes the possible values of the variable from a bool to a tristate. The previous 'false' state is changed into 'verbosity_normal'. The previous 'true' state is changed into 'verbosity_verbose'. The new added state is 'verbosity_silent'. It should prevent anything to be printed on both stderr and stdout. This is needed because `git am` wants to first call apply functionality silently, if it can then fall back on 3-way merge in case of error. Printing on stdout, and calls to warning() or error() are not taken care of in this patch, as that will be done in following patches. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

apply: make some parsing functions static again

2016-09-07T19:29:53Z

Some parsing functions that were used in both "apply.c" and "builtin/apply.c" are now only used in the former, so they can be made static to "apply.c". Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

apply: move libified code from builtin/apply.c to apply.{c,h}

2016-09-07T19:29:53Z

As most of the apply code in builtin/apply.c has been libified by a number of previous commits, it can now be moved to apply.{c,h}, so that more code can use it. Helped-by: Nguyễn Thái Ngọc Duy Helped-by: Ramsay Jones Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

apply: rename and move opt constants to apply.h

2016-09-07T19:29:53Z

The constants for the "inaccurate-eof" and the "recount" options will be used in both "apply.c" and "builtin/apply.c", so they need to go into "apply.h", and therefore they need a name that is more specific to the API they belong to. Helped-by: Stefan Beller Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

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

2016-08-11T19:41:47Z

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 Signed-off-by: Junio C Hamano

apply: make init_apply_state() return -1 instead of exit()ing

2016-08-11T19:41:47Z

To libify `git apply` functionality we have to signal errors to the caller instead of exit()ing. To do that in a compatible manner with the rest of the error handling in "builtin/apply.c", init_apply_state() should return -1 instead of calling exit(). Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano