]> git.ipfire.org Git - thirdparty/git.git/blame - apply.h
Git 2.45-rc0
[thirdparty/git.git] / apply.h
CommitLineData
71501a71
CC
1#ifndef APPLY_H
2#define APPLY_H
3
d1cbe1e6 4#include "hash-ll.h"
ef3ca954
EN
5#include "lockfile.h"
6#include "string-list.h"
4e9a3252 7#include "strmap.h"
ef3ca954 8
82ea77ec
NTND
9struct repository;
10
71501a71
CC
11enum apply_ws_error_action {
12 nowarn_ws_error,
13 warn_on_ws_error,
14 die_on_ws_error,
15 correct_ws_error
16};
17
18enum apply_ws_ignore {
19 ignore_ws_none,
20 ignore_ws_change
21};
22
a46160d2
CC
23enum apply_verbosity {
24 verbosity_silent = -1,
25 verbosity_normal = 0,
26 verbosity_verbose = 1
27};
28
71501a71
CC
29struct apply_state {
30 const char *prefix;
71501a71 31
d13cd4c9 32 /* Lock file */
6d058c88 33 struct lock_file lock_file;
71501a71
CC
34
35 /* These control what gets looked at and modified */
36 int apply; /* this is not a dry-run */
37 int cached; /* apply to the index only */
38 int check; /* preimage must match working tree, don't actually apply */
39 int check_index; /* preimage must match the indexed version */
40 int update_index; /* check_index && apply */
cff5dc09 41 int ita_only; /* add intent-to-add entries to the index */
71501a71
CC
42
43 /* These control cosmetic aspect of the output */
44 int diffstat; /* just show a diffstat, and don't actually apply */
45 int numstat; /* just show a numeric diffstat, and don't actually apply */
46 int summary; /* just report creation, deletion, etc, and don't actually apply */
47
48 /* These boolean parameters control how the apply is done */
49 int allow_overlap;
50 int apply_in_reverse;
51 int apply_with_reject;
71501a71
CC
52 int no_add;
53 int threeway;
54 int unidiff_zero;
55 int unsafe_paths;
324eb77e 56 int allow_empty;
71501a71
CC
57
58 /* Other non boolean parameters */
82ea77ec 59 struct repository *repo;
5b0b57fd 60 const char *index_file;
a46160d2 61 enum apply_verbosity apply_verbosity;
71501a71
CC
62 const char *fake_ancestor;
63 const char *patch_input_file;
64 int line_termination;
65 struct strbuf root;
66 int p_value;
67 int p_value_known;
68 unsigned int p_context;
69
70 /* Exclude and include path parameters */
71 struct string_list limit_by_name;
72 int has_include;
73
74 /* Various "current state" */
75 int linenr; /* current line number */
4e9a3252
RS
76 /*
77 * We need to keep track of how symlinks in the preimage are
78 * manipulated by the patches. A patch to add a/b/c where a/b
79 * is a symlink should not be allowed to affect the directory
80 * the symlink points at, but if the same patch removes a/b,
81 * it is perfectly fine, as the patch removes a/b to make room
82 * to create a directory a/b so that a/b/c can be created.
83 */
84 struct strset removed_symlinks;
85 struct strset kept_symlinks;
71501a71
CC
86
87 /*
88 * For "diff-stat" like behaviour, we keep track of the biggest change
89 * we've seen, and the longest filename. That allows us to do simple
90 * scaling.
91 */
92 int max_change;
93 int max_len;
94
95 /*
96 * Records filenames that have been touched, in order to handle
97 * the case where more than one patches touch the same file.
98 */
99 struct string_list fn_table;
100
45b78d8b
CC
101 /*
102 * This is to save reporting routines before using
103 * set_error_routine() or set_warn_routine() to install muting
104 * routines when in verbosity_silent mode.
105 */
106 void (*saved_error_routine)(const char *err, va_list params);
107 void (*saved_warn_routine)(const char *warn, va_list params);
108
71501a71
CC
109 /* These control whitespace errors */
110 enum apply_ws_error_action ws_error_action;
111 enum apply_ws_ignore ws_ignore_action;
112 const char *whitespace_option;
113 int whitespace_error;
114 int squelch_whitespace_errors;
115 int applied_after_fixing_ws;
116};
117
ef283b36
TG
118/*
119 * This represents a "patch" to a file, both metainfo changes
120 * such as creation/deletion, filemode and content changes represented
121 * as a series of fragments.
122 */
123struct patch {
124 char *new_name, *old_name, *def_name;
125 unsigned int old_mode, new_mode;
126 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
127 int rejected;
128 unsigned ws_rule;
129 int lines_added, lines_deleted;
130 int score;
131 int extension_linenr; /* first line specifying delete/new/rename/copy */
132 unsigned int is_toplevel_relative:1;
133 unsigned int inaccurate_eof:1;
134 unsigned int is_binary:1;
135 unsigned int is_copy:1;
136 unsigned int is_rename:1;
137 unsigned int recount:1;
138 unsigned int conflicted_threeway:1;
139 unsigned int direct_to_threeway:1;
140 unsigned int crlf_in_old:1;
141 struct fragment *fragments;
142 char *result;
143 size_t resultsize;
144 char old_oid_prefix[GIT_MAX_HEXSZ + 1];
145 char new_oid_prefix[GIT_MAX_HEXSZ + 1];
146 struct patch *next;
147
148 /* three-way fallback result */
149 struct object_id threeway_stage[3];
150};
151
45635ec9
NTND
152int apply_parse_options(int argc, const char **argv,
153 struct apply_state *state,
154 int *force_apply, int *options,
155 const char * const *apply_usage);
156int init_apply_state(struct apply_state *state,
82ea77ec 157 struct repository *repo,
45635ec9
NTND
158 const char *prefix);
159void clear_apply_state(struct apply_state *state);
160int check_apply_state(struct apply_state *state, int force_apply);
bb493a5c 161
ef283b36
TG
162/*
163 * Parse a git diff header, starting at line. Fills the relevant
164 * metadata information in 'struct patch'.
165 *
166 * Returns -1 on failure, the length of the parsed header otherwise.
167 */
168int parse_git_diff_header(struct strbuf *root,
169 int *linenr,
170 int p_value,
171 const char *line,
172 int len,
173 unsigned int size,
174 struct patch *patch);
175
4998e93f
ÆAB
176void release_patch(struct patch *patch);
177
803bf4e0
CC
178/*
179 * Some aspects of the apply behavior are controlled by the following
180 * bits in the "options" parameter passed to apply_all_patches().
181 */
182#define APPLY_OPT_INACCURATE_EOF (1<<0) /* accept inaccurate eof */
183#define APPLY_OPT_RECOUNT (1<<1) /* accept inaccurate line count */
184
45635ec9
NTND
185int apply_all_patches(struct apply_state *state,
186 int argc, const char **argv,
187 int options);
13b5af22 188
71501a71 189#endif