4 enum apply_ws_error_action
{
11 enum apply_ws_ignore
{
16 enum apply_verbosity
{
17 verbosity_silent
= -1,
23 * We need to keep track of how symlinks in the preimage are
24 * manipulated by the patches. A patch to add a/b/c where a/b
25 * is a symlink should not be allowed to affect the directory
26 * the symlink points at, but if the same patch removes a/b,
27 * it is perfectly fine, as the patch removes a/b to make room
28 * to create a directory a/b so that a/b/c can be created.
30 * See also "struct string_list symlink_changes" in "struct
33 #define APPLY_SYMLINK_GOES_AWAY 01
34 #define APPLY_SYMLINK_IN_RESULT 02
40 struct lock_file lock_file
;
42 /* These control what gets looked at and modified */
43 int apply
; /* this is not a dry-run */
44 int cached
; /* apply to the index only */
45 int check
; /* preimage must match working tree, don't actually apply */
46 int check_index
; /* preimage must match the indexed version */
47 int update_index
; /* check_index && apply */
48 int ita_only
; /* add intent-to-add entries to the index */
50 /* These control cosmetic aspect of the output */
51 int diffstat
; /* just show a diffstat, and don't actually apply */
52 int numstat
; /* just show a numeric diffstat, and don't actually apply */
53 int summary
; /* just report creation, deletion, etc, and don't actually apply */
55 /* These boolean parameters control how the apply is done */
58 int apply_with_reject
;
64 /* Other non boolean parameters */
65 const char *index_file
;
66 enum apply_verbosity apply_verbosity
;
67 const char *fake_ancestor
;
68 const char *patch_input_file
;
73 unsigned int p_context
;
75 /* Exclude and include path parameters */
76 struct string_list limit_by_name
;
79 /* Various "current state" */
80 int linenr
; /* current line number */
81 struct string_list symlink_changes
; /* we have to track symlinks */
84 * For "diff-stat" like behaviour, we keep track of the biggest change
85 * we've seen, and the longest filename. That allows us to do simple
92 * Records filenames that have been touched, in order to handle
93 * the case where more than one patches touch the same file.
95 struct string_list fn_table
;
98 * This is to save reporting routines before using
99 * set_error_routine() or set_warn_routine() to install muting
100 * routines when in verbosity_silent mode.
102 void (*saved_error_routine
)(const char *err
, va_list params
);
103 void (*saved_warn_routine
)(const char *warn
, va_list params
);
105 /* These control whitespace errors */
106 enum apply_ws_error_action ws_error_action
;
107 enum apply_ws_ignore ws_ignore_action
;
108 const char *whitespace_option
;
109 int whitespace_error
;
110 int squelch_whitespace_errors
;
111 int applied_after_fixing_ws
;
114 int apply_parse_options(int argc
, const char **argv
,
115 struct apply_state
*state
,
116 int *force_apply
, int *options
,
117 const char * const *apply_usage
);
118 int init_apply_state(struct apply_state
*state
,
120 void clear_apply_state(struct apply_state
*state
);
121 int check_apply_state(struct apply_state
*state
, int force_apply
);
124 * Some aspects of the apply behavior are controlled by the following
125 * bits in the "options" parameter passed to apply_all_patches().
127 #define APPLY_OPT_INACCURATE_EOF (1<<0) /* accept inaccurate eof */
128 #define APPLY_OPT_RECOUNT (1<<1) /* accept inaccurate line count */
130 int apply_all_patches(struct apply_state
*state
,
131 int argc
, const char **argv
,