usage: add get_error_routine() and get_warn_routine()
[git/git.git] / apply.h
CommitLineData
71501a71
CC
1#ifndef APPLY_H
2#define APPLY_H
3
4enum apply_ws_error_action {
5 nowarn_ws_error,
6 warn_on_ws_error,
7 die_on_ws_error,
8 correct_ws_error
9};
10
11enum apply_ws_ignore {
12 ignore_ws_none,
13 ignore_ws_change
14};
15
a46160d2
CC
16enum apply_verbosity {
17 verbosity_silent = -1,
18 verbosity_normal = 0,
19 verbosity_verbose = 1
20};
21
71501a71
CC
22/*
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.
29 *
30 * See also "struct string_list symlink_changes" in "struct
31 * apply_state".
32 */
33#define APPLY_SYMLINK_GOES_AWAY 01
34#define APPLY_SYMLINK_IN_RESULT 02
35
36struct apply_state {
37 const char *prefix;
38 int prefix_length;
39
40 /* These are lock_file related */
41 struct lock_file *lock_file;
42 int newfd;
43
44 /* These control what gets looked at and modified */
45 int apply; /* this is not a dry-run */
46 int cached; /* apply to the index only */
47 int check; /* preimage must match working tree, don't actually apply */
48 int check_index; /* preimage must match the indexed version */
49 int update_index; /* check_index && apply */
50
51 /* These control cosmetic aspect of the output */
52 int diffstat; /* just show a diffstat, and don't actually apply */
53 int numstat; /* just show a numeric diffstat, and don't actually apply */
54 int summary; /* just report creation, deletion, etc, and don't actually apply */
55
56 /* These boolean parameters control how the apply is done */
57 int allow_overlap;
58 int apply_in_reverse;
59 int apply_with_reject;
71501a71
CC
60 int no_add;
61 int threeway;
62 int unidiff_zero;
63 int unsafe_paths;
64
65 /* Other non boolean parameters */
a46160d2 66 enum apply_verbosity apply_verbosity;
71501a71
CC
67 const char *fake_ancestor;
68 const char *patch_input_file;
69 int line_termination;
70 struct strbuf root;
71 int p_value;
72 int p_value_known;
73 unsigned int p_context;
74
75 /* Exclude and include path parameters */
76 struct string_list limit_by_name;
77 int has_include;
78
79 /* Various "current state" */
80 int linenr; /* current line number */
81 struct string_list symlink_changes; /* we have to track symlinks */
82
83 /*
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
86 * scaling.
87 */
88 int max_change;
89 int max_len;
90
91 /*
92 * Records filenames that have been touched, in order to handle
93 * the case where more than one patches touch the same file.
94 */
95 struct string_list fn_table;
96
97 /* These control whitespace errors */
98 enum apply_ws_error_action ws_error_action;
99 enum apply_ws_ignore ws_ignore_action;
100 const char *whitespace_option;
101 int whitespace_error;
102 int squelch_whitespace_errors;
103 int applied_after_fixing_ws;
104};
105
13b5af22
CC
106extern int apply_option_parse_exclude(const struct option *opt,
107 const char *arg, int unset);
108extern int apply_option_parse_include(const struct option *opt,
109 const char *arg, int unset);
110extern int apply_option_parse_p(const struct option *opt,
111 const char *arg,
112 int unset);
113extern int apply_option_parse_whitespace(const struct option *opt,
114 const char *arg, int unset);
115extern int apply_option_parse_directory(const struct option *opt,
116 const char *arg, int unset);
117extern int apply_option_parse_space_change(const struct option *opt,
118 const char *arg, int unset);
119
2f5a6d12
CC
120extern int init_apply_state(struct apply_state *state,
121 const char *prefix,
122 struct lock_file *lock_file);
bb493a5c 123extern void clear_apply_state(struct apply_state *state);
b6446d54 124extern int check_apply_state(struct apply_state *state, int force_apply);
bb493a5c 125
803bf4e0
CC
126/*
127 * Some aspects of the apply behavior are controlled by the following
128 * bits in the "options" parameter passed to apply_all_patches().
129 */
130#define APPLY_OPT_INACCURATE_EOF (1<<0) /* accept inaccurate eof */
131#define APPLY_OPT_RECOUNT (1<<1) /* accept inaccurate line count */
132
13b5af22
CC
133extern int apply_all_patches(struct apply_state *state,
134 int argc,
135 const char **argv,
136 int options);
137
71501a71 138#endif