]>
Commit | Line | Data |
---|---|---|
c1bb9350 LT |
1 | /* |
2 | * apply.c | |
3 | * | |
4 | * Copyright (C) Linus Torvalds, 2005 | |
5 | * | |
6 | * This applies patches on top of some (arbitrary) version of the SCM. | |
7 | * | |
c1bb9350 | 8 | */ |
c1bb9350 | 9 | #include "cache.h" |
03ac6e64 | 10 | #include "cache-tree.h" |
22943f1a | 11 | #include "quote.h" |
8e440259 | 12 | #include "blob.h" |
051308f6 | 13 | #include "delta.h" |
ac6245e3 | 14 | #include "builtin.h" |
c1bb9350 | 15 | |
a9486b02 PR |
16 | /* |
17 | * --check turns on checking that the working tree matches the | |
18 | * files that are being modified, but doesn't apply the patch | |
19 | * --stat does just a diffstat, and doesn't actually apply | |
20 | * --numstat does numeric diffstat, and doesn't actually apply | |
21 | * --index-info shows the old and new index info for paths if available. | |
22 | * --index updates the cache as well. | |
23 | * --cached updates only the cache without ever touching the working tree. | |
24 | */ | |
edf2e370 JH |
25 | static const char *prefix; |
26 | static int prefix_length = -1; | |
dbd0f7d3 | 27 | static int newfd = -1; |
edf2e370 | 28 | |
4be60962 | 29 | static int unidiff_zero; |
e36f8b60 | 30 | static int p_value = 1; |
3e8a5db9 | 31 | static int p_value_known; |
96f1e58f | 32 | static int check_index; |
7da3bf37 | 33 | static int update_index; |
96f1e58f DR |
34 | static int cached; |
35 | static int diffstat; | |
36 | static int numstat; | |
37 | static int summary; | |
38 | static int check; | |
a577284a | 39 | static int apply = 1; |
96f1e58f | 40 | static int apply_in_reverse; |
57dc397c | 41 | static int apply_with_reject; |
a2bf404e | 42 | static int apply_verbosely; |
96f1e58f | 43 | static int no_add; |
7a988699 | 44 | static const char *fake_ancestor; |
22943f1a | 45 | static int line_termination = '\n'; |
bf8675d3 | 46 | static unsigned long p_context = ULONG_MAX; |
12dd6e8c | 47 | static const char apply_usage[] = |
91af7ae5 | 48 | "git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=<nowarn|warn|fix|error|error-all>] <patch>..."; |
c1bb9350 | 49 | |
81bf96bb JH |
50 | static enum ws_error_action { |
51 | nowarn_ws_error, | |
52 | warn_on_ws_error, | |
53 | die_on_ws_error, | |
54 | correct_ws_error, | |
55 | } ws_error_action = warn_on_ws_error; | |
96f1e58f | 56 | static int whitespace_error; |
fc96b7c9 | 57 | static int squelch_whitespace_errors = 5; |
c94bf41c | 58 | static int applied_after_fixing_ws; |
96f1e58f | 59 | static const char *patch_input_file; |
19bfcd5a | 60 | |
2ae1c53b JH |
61 | static void parse_whitespace_option(const char *option) |
62 | { | |
63 | if (!option) { | |
81bf96bb | 64 | ws_error_action = warn_on_ws_error; |
2ae1c53b JH |
65 | return; |
66 | } | |
67 | if (!strcmp(option, "warn")) { | |
81bf96bb | 68 | ws_error_action = warn_on_ws_error; |
2ae1c53b JH |
69 | return; |
70 | } | |
621603b7 | 71 | if (!strcmp(option, "nowarn")) { |
81bf96bb | 72 | ws_error_action = nowarn_ws_error; |
621603b7 JH |
73 | return; |
74 | } | |
2ae1c53b | 75 | if (!strcmp(option, "error")) { |
81bf96bb | 76 | ws_error_action = die_on_ws_error; |
2ae1c53b JH |
77 | return; |
78 | } | |
79 | if (!strcmp(option, "error-all")) { | |
81bf96bb | 80 | ws_error_action = die_on_ws_error; |
2ae1c53b JH |
81 | squelch_whitespace_errors = 0; |
82 | return; | |
83 | } | |
81bf96bb JH |
84 | if (!strcmp(option, "strip") || !strcmp(option, "fix")) { |
85 | ws_error_action = correct_ws_error; | |
2ae1c53b JH |
86 | return; |
87 | } | |
88 | die("unrecognized whitespace option '%s'", option); | |
89 | } | |
90 | ||
f21d6726 JH |
91 | static void set_default_whitespace_mode(const char *whitespace_option) |
92 | { | |
81bf96bb JH |
93 | if (!whitespace_option && !apply_default_whitespace) |
94 | ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error); | |
f21d6726 JH |
95 | } |
96 | ||
3f40315a LT |
97 | /* |
98 | * For "diff-stat" like behaviour, we keep track of the biggest change | |
99 | * we've seen, and the longest filename. That allows us to do simple | |
100 | * scaling. | |
101 | */ | |
102 | static int max_change, max_len; | |
103 | ||
a4acb0eb LT |
104 | /* |
105 | * Various "current state", notably line numbers and what | |
106 | * file (and how) we're patching right now.. The "is_xxxx" | |
107 | * things are flags, where -1 means "don't know yet". | |
108 | */ | |
46979f56 | 109 | static int linenr = 1; |
19c58fb8 | 110 | |
3cd4f5e8 JH |
111 | /* |
112 | * This represents one "hunk" from a patch, starting with | |
113 | * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The | |
114 | * patch text is pointed at by patch, and its byte length | |
115 | * is stored in size. leading and trailing are the number | |
116 | * of context lines. | |
117 | */ | |
19c58fb8 | 118 | struct fragment { |
47495887 | 119 | unsigned long leading, trailing; |
19c58fb8 LT |
120 | unsigned long oldpos, oldlines; |
121 | unsigned long newpos, newlines; | |
122 | const char *patch; | |
123 | int size; | |
57dc397c | 124 | int rejected; |
19c58fb8 LT |
125 | struct fragment *next; |
126 | }; | |
127 | ||
3cd4f5e8 JH |
128 | /* |
129 | * When dealing with a binary patch, we reuse "leading" field | |
130 | * to store the type of the binary hunk, either deflated "delta" | |
131 | * or deflated "literal". | |
132 | */ | |
133 | #define binary_patch_method leading | |
134 | #define BINARY_DELTA_DEFLATED 1 | |
135 | #define BINARY_LITERAL_DEFLATED 2 | |
136 | ||
81bf96bb JH |
137 | /* |
138 | * This represents a "patch" to a file, both metainfo changes | |
139 | * such as creation/deletion, filemode and content changes represented | |
140 | * as a series of fragments. | |
141 | */ | |
19c58fb8 | 142 | struct patch { |
5041aa70 | 143 | char *new_name, *old_name, *def_name; |
19c58fb8 | 144 | unsigned int old_mode, new_mode; |
3dad11bf | 145 | int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */ |
57dc397c | 146 | int rejected; |
cf1b7869 | 147 | unsigned ws_rule; |
0660626c | 148 | unsigned long deflate_origlen; |
3f40315a | 149 | int lines_added, lines_deleted; |
96c912a4 | 150 | int score; |
9987d7c5 | 151 | unsigned int is_toplevel_relative:1; |
3dad11bf RS |
152 | unsigned int inaccurate_eof:1; |
153 | unsigned int is_binary:1; | |
154 | unsigned int is_copy:1; | |
155 | unsigned int is_rename:1; | |
19c58fb8 | 156 | struct fragment *fragments; |
5aa7d94c | 157 | char *result; |
c32f749f | 158 | size_t resultsize; |
2cf67f1e JH |
159 | char old_sha1_prefix[41]; |
160 | char new_sha1_prefix[41]; | |
19c58fb8 LT |
161 | struct patch *next; |
162 | }; | |
46979f56 | 163 | |
b94f2eda JH |
164 | /* |
165 | * A line in a file, len-bytes long (includes the terminating LF, | |
166 | * except for an incomplete line at the end if the file ends with | |
167 | * one), and its contents hashes to 'hash'. | |
168 | */ | |
169 | struct line { | |
170 | size_t len; | |
171 | unsigned hash : 24; | |
172 | unsigned flag : 8; | |
c330fdd4 | 173 | #define LINE_COMMON 1 |
b94f2eda JH |
174 | }; |
175 | ||
176 | /* | |
177 | * This represents a "file", which is an array of "lines". | |
178 | */ | |
179 | struct image { | |
180 | char *buf; | |
181 | size_t len; | |
182 | size_t nr; | |
c330fdd4 | 183 | size_t alloc; |
b94f2eda JH |
184 | struct line *line_allocated; |
185 | struct line *line; | |
186 | }; | |
187 | ||
188 | static uint32_t hash_line(const char *cp, size_t len) | |
189 | { | |
190 | size_t i; | |
191 | uint32_t h; | |
192 | for (i = 0, h = 0; i < len; i++) { | |
193 | if (!isspace(cp[i])) { | |
194 | h = h * 3 + (cp[i] & 0xff); | |
195 | } | |
196 | } | |
197 | return h; | |
198 | } | |
199 | ||
c330fdd4 JH |
200 | static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag) |
201 | { | |
202 | ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc); | |
203 | img->line_allocated[img->nr].len = len; | |
204 | img->line_allocated[img->nr].hash = hash_line(bol, len); | |
205 | img->line_allocated[img->nr].flag = flag; | |
206 | img->nr++; | |
207 | } | |
208 | ||
b94f2eda JH |
209 | static void prepare_image(struct image *image, char *buf, size_t len, |
210 | int prepare_linetable) | |
211 | { | |
212 | const char *cp, *ep; | |
b94f2eda | 213 | |
c330fdd4 | 214 | memset(image, 0, sizeof(*image)); |
b94f2eda JH |
215 | image->buf = buf; |
216 | image->len = len; | |
217 | ||
c330fdd4 | 218 | if (!prepare_linetable) |
b94f2eda | 219 | return; |
b94f2eda JH |
220 | |
221 | ep = image->buf + image->len; | |
b94f2eda | 222 | cp = image->buf; |
b94f2eda JH |
223 | while (cp < ep) { |
224 | const char *next; | |
225 | for (next = cp; next < ep && *next != '\n'; next++) | |
226 | ; | |
227 | if (next < ep) | |
228 | next++; | |
c330fdd4 | 229 | add_line_info(image, cp, next - cp, 0); |
b94f2eda | 230 | cp = next; |
b94f2eda | 231 | } |
c330fdd4 | 232 | image->line = image->line_allocated; |
b94f2eda JH |
233 | } |
234 | ||
235 | static void clear_image(struct image *image) | |
236 | { | |
237 | free(image->buf); | |
238 | image->buf = NULL; | |
239 | image->len = 0; | |
240 | } | |
241 | ||
81bf96bb JH |
242 | static void say_patch_name(FILE *output, const char *pre, |
243 | struct patch *patch, const char *post) | |
a2bf404e JH |
244 | { |
245 | fputs(pre, output); | |
246 | if (patch->old_name && patch->new_name && | |
247 | strcmp(patch->old_name, patch->new_name)) { | |
663af342 | 248 | quote_c_style(patch->old_name, NULL, output, 0); |
a2bf404e | 249 | fputs(" => ", output); |
663af342 PH |
250 | quote_c_style(patch->new_name, NULL, output, 0); |
251 | } else { | |
a2bf404e JH |
252 | const char *n = patch->new_name; |
253 | if (!n) | |
254 | n = patch->old_name; | |
663af342 | 255 | quote_c_style(n, NULL, output, 0); |
a2bf404e JH |
256 | } |
257 | fputs(post, output); | |
258 | } | |
259 | ||
c1bb9350 | 260 | #define CHUNKSIZE (8192) |
a4acb0eb | 261 | #define SLOP (16) |
c1bb9350 | 262 | |
9a76adeb | 263 | static void read_patch_file(struct strbuf *sb, int fd) |
c1bb9350 | 264 | { |
9a76adeb | 265 | if (strbuf_read(sb, fd, 0) < 0) |
af6eb822 | 266 | die("git-apply: read returned %s", strerror(errno)); |
a4acb0eb LT |
267 | |
268 | /* | |
269 | * Make sure that we have some slop in the buffer | |
270 | * so that we can do speculative "memcmp" etc, and | |
271 | * see to it that it is NUL-filled. | |
272 | */ | |
9a76adeb PH |
273 | strbuf_grow(sb, SLOP); |
274 | memset(sb->buf + sb->len, 0, SLOP); | |
c1bb9350 LT |
275 | } |
276 | ||
3cca928d | 277 | static unsigned long linelen(const char *buffer, unsigned long size) |
c1bb9350 LT |
278 | { |
279 | unsigned long len = 0; | |
280 | while (size--) { | |
281 | len++; | |
282 | if (*buffer++ == '\n') | |
283 | break; | |
284 | } | |
285 | return len; | |
286 | } | |
287 | ||
a4acb0eb LT |
288 | static int is_dev_null(const char *str) |
289 | { | |
290 | return !memcmp("/dev/null", str, 9) && isspace(str[9]); | |
291 | } | |
292 | ||
381ca9a3 LT |
293 | #define TERM_SPACE 1 |
294 | #define TERM_TAB 2 | |
9a4a100e LT |
295 | |
296 | static int name_terminate(const char *name, int namelen, int c, int terminate) | |
297 | { | |
298 | if (c == ' ' && !(terminate & TERM_SPACE)) | |
299 | return 0; | |
300 | if (c == '\t' && !(terminate & TERM_TAB)) | |
301 | return 0; | |
302 | ||
9a4a100e LT |
303 | return 1; |
304 | } | |
305 | ||
56185f49 | 306 | static char *find_name(const char *line, char *def, int p_value, int terminate) |
c1bb9350 | 307 | { |
a4acb0eb LT |
308 | int len; |
309 | const char *start = line; | |
a4acb0eb | 310 | |
22943f1a | 311 | if (*line == '"') { |
7fb1011e PH |
312 | struct strbuf name; |
313 | ||
81bf96bb JH |
314 | /* |
315 | * Proposed "new-style" GNU patch/diff format; see | |
22943f1a JH |
316 | * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2 |
317 | */ | |
7fb1011e PH |
318 | strbuf_init(&name, 0); |
319 | if (!unquote_c_style(&name, line, NULL)) { | |
320 | char *cp; | |
321 | ||
322 | for (cp = name.buf; p_value; p_value--) { | |
3d845d77 | 323 | cp = strchr(cp, '/'); |
22943f1a JH |
324 | if (!cp) |
325 | break; | |
326 | cp++; | |
22943f1a JH |
327 | } |
328 | if (cp) { | |
329 | /* name can later be freed, so we need | |
330 | * to memmove, not just return cp | |
331 | */ | |
7fb1011e | 332 | strbuf_remove(&name, 0, cp - name.buf); |
22943f1a | 333 | free(def); |
b315c5c0 | 334 | return strbuf_detach(&name, NULL); |
22943f1a JH |
335 | } |
336 | } | |
7fb1011e | 337 | strbuf_release(&name); |
22943f1a JH |
338 | } |
339 | ||
c1bb9350 | 340 | for (;;) { |
a4acb0eb | 341 | char c = *line; |
9a4a100e LT |
342 | |
343 | if (isspace(c)) { | |
344 | if (c == '\n') | |
345 | break; | |
346 | if (name_terminate(start, line-start, c, terminate)) | |
347 | break; | |
348 | } | |
a4acb0eb LT |
349 | line++; |
350 | if (c == '/' && !--p_value) | |
351 | start = line; | |
352 | } | |
353 | if (!start) | |
354 | return def; | |
355 | len = line - start; | |
356 | if (!len) | |
357 | return def; | |
358 | ||
359 | /* | |
360 | * Generally we prefer the shorter name, especially | |
361 | * if the other one is just a variation of that with | |
362 | * something else tacked on to the end (ie "file.orig" | |
363 | * or "file~"). | |
364 | */ | |
365 | if (def) { | |
366 | int deflen = strlen(def); | |
367 | if (deflen < len && !strncmp(start, def, deflen)) | |
368 | return def; | |
ca032835 | 369 | free(def); |
c1bb9350 | 370 | } |
a4acb0eb | 371 | |
182af834 | 372 | return xmemdupz(start, len); |
a4acb0eb LT |
373 | } |
374 | ||
3e8a5db9 JH |
375 | static int count_slashes(const char *cp) |
376 | { | |
377 | int cnt = 0; | |
378 | char ch; | |
379 | ||
380 | while ((ch = *cp++)) | |
381 | if (ch == '/') | |
382 | cnt++; | |
383 | return cnt; | |
384 | } | |
385 | ||
386 | /* | |
387 | * Given the string after "--- " or "+++ ", guess the appropriate | |
388 | * p_value for the given patch. | |
389 | */ | |
390 | static int guess_p_value(const char *nameline) | |
391 | { | |
392 | char *name, *cp; | |
393 | int val = -1; | |
394 | ||
395 | if (is_dev_null(nameline)) | |
396 | return -1; | |
397 | name = find_name(nameline, NULL, 0, TERM_SPACE | TERM_TAB); | |
398 | if (!name) | |
399 | return -1; | |
400 | cp = strchr(name, '/'); | |
401 | if (!cp) | |
402 | val = 0; | |
403 | else if (prefix) { | |
404 | /* | |
405 | * Does it begin with "a/$our-prefix" and such? Then this is | |
406 | * very likely to apply to our directory. | |
407 | */ | |
408 | if (!strncmp(name, prefix, prefix_length)) | |
409 | val = count_slashes(prefix); | |
410 | else { | |
411 | cp++; | |
412 | if (!strncmp(cp, prefix, prefix_length)) | |
413 | val = count_slashes(prefix) + 1; | |
414 | } | |
415 | } | |
416 | free(name); | |
417 | return val; | |
418 | } | |
419 | ||
a4acb0eb | 420 | /* |
88f6dbaf | 421 | * Get the name etc info from the ---/+++ lines of a traditional patch header |
a4acb0eb | 422 | * |
9a4a100e LT |
423 | * FIXME! The end-of-filename heuristics are kind of screwy. For existing |
424 | * files, we can happily check the index for a match, but for creating a | |
425 | * new file we should try to match whatever "patch" does. I have no idea. | |
a4acb0eb | 426 | */ |
19c58fb8 | 427 | static void parse_traditional_patch(const char *first, const char *second, struct patch *patch) |
a4acb0eb | 428 | { |
a4acb0eb LT |
429 | char *name; |
430 | ||
a9486b02 PR |
431 | first += 4; /* skip "--- " */ |
432 | second += 4; /* skip "+++ " */ | |
3e8a5db9 JH |
433 | if (!p_value_known) { |
434 | int p, q; | |
435 | p = guess_p_value(first); | |
436 | q = guess_p_value(second); | |
437 | if (p < 0) p = q; | |
438 | if (0 <= p && p == q) { | |
439 | p_value = p; | |
440 | p_value_known = 1; | |
441 | } | |
442 | } | |
a4acb0eb | 443 | if (is_dev_null(first)) { |
19c58fb8 LT |
444 | patch->is_new = 1; |
445 | patch->is_delete = 0; | |
5041aa70 | 446 | name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB); |
19c58fb8 | 447 | patch->new_name = name; |
a4acb0eb | 448 | } else if (is_dev_null(second)) { |
19c58fb8 LT |
449 | patch->is_new = 0; |
450 | patch->is_delete = 1; | |
381ca9a3 | 451 | name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB); |
19c58fb8 | 452 | patch->old_name = name; |
a4acb0eb | 453 | } else { |
381ca9a3 LT |
454 | name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB); |
455 | name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB); | |
19c58fb8 | 456 | patch->old_name = patch->new_name = name; |
a4acb0eb LT |
457 | } |
458 | if (!name) | |
459 | die("unable to find filename in patch at line %d", linenr); | |
a4acb0eb LT |
460 | } |
461 | ||
19c58fb8 | 462 | static int gitdiff_hdrend(const char *line, struct patch *patch) |
a4acb0eb LT |
463 | { |
464 | return -1; | |
465 | } | |
466 | ||
1e3f6b6e LT |
467 | /* |
468 | * We're anal about diff header consistency, to make | |
469 | * sure that we don't end up having strange ambiguous | |
470 | * patches floating around. | |
471 | * | |
472 | * As a result, gitdiff_{old|new}name() will check | |
473 | * their names against any previous information, just | |
474 | * to make sure.. | |
475 | */ | |
476 | static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew) | |
477 | { | |
1e3f6b6e | 478 | if (!orig_name && !isnull) |
79ee194e | 479 | return find_name(line, NULL, p_value, TERM_TAB); |
1e3f6b6e | 480 | |
1e3f6b6e | 481 | if (orig_name) { |
22943f1a JH |
482 | int len; |
483 | const char *name; | |
484 | char *another; | |
1e3f6b6e LT |
485 | name = orig_name; |
486 | len = strlen(name); | |
487 | if (isnull) | |
488 | die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr); | |
79ee194e | 489 | another = find_name(line, NULL, p_value, TERM_TAB); |
22943f1a JH |
490 | if (!another || memcmp(another, name, len)) |
491 | die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr); | |
492 | free(another); | |
1e3f6b6e LT |
493 | return orig_name; |
494 | } | |
22943f1a JH |
495 | else { |
496 | /* expect "/dev/null" */ | |
497 | if (memcmp("/dev/null", line, 9) || line[9] != '\n') | |
498 | die("git-apply: bad git-diff - expected /dev/null on line %d", linenr); | |
499 | return NULL; | |
500 | } | |
1e3f6b6e LT |
501 | } |
502 | ||
19c58fb8 | 503 | static int gitdiff_oldname(const char *line, struct patch *patch) |
a4acb0eb | 504 | { |
19c58fb8 | 505 | patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old"); |
a4acb0eb LT |
506 | return 0; |
507 | } | |
508 | ||
19c58fb8 | 509 | static int gitdiff_newname(const char *line, struct patch *patch) |
a4acb0eb | 510 | { |
19c58fb8 | 511 | patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new"); |
a4acb0eb LT |
512 | return 0; |
513 | } | |
514 | ||
19c58fb8 | 515 | static int gitdiff_oldmode(const char *line, struct patch *patch) |
a4acb0eb | 516 | { |
19c58fb8 | 517 | patch->old_mode = strtoul(line, NULL, 8); |
a4acb0eb LT |
518 | return 0; |
519 | } | |
520 | ||
19c58fb8 | 521 | static int gitdiff_newmode(const char *line, struct patch *patch) |
a4acb0eb | 522 | { |
19c58fb8 | 523 | patch->new_mode = strtoul(line, NULL, 8); |
a4acb0eb LT |
524 | return 0; |
525 | } | |
526 | ||
19c58fb8 | 527 | static int gitdiff_delete(const char *line, struct patch *patch) |
a4acb0eb | 528 | { |
19c58fb8 | 529 | patch->is_delete = 1; |
5041aa70 | 530 | patch->old_name = patch->def_name; |
19c58fb8 | 531 | return gitdiff_oldmode(line, patch); |
a4acb0eb LT |
532 | } |
533 | ||
19c58fb8 | 534 | static int gitdiff_newfile(const char *line, struct patch *patch) |
a4acb0eb | 535 | { |
19c58fb8 | 536 | patch->is_new = 1; |
5041aa70 | 537 | patch->new_name = patch->def_name; |
19c58fb8 | 538 | return gitdiff_newmode(line, patch); |
a4acb0eb LT |
539 | } |
540 | ||
19c58fb8 | 541 | static int gitdiff_copysrc(const char *line, struct patch *patch) |
a4acb0eb | 542 | { |
19c58fb8 LT |
543 | patch->is_copy = 1; |
544 | patch->old_name = find_name(line, NULL, 0, 0); | |
a4acb0eb LT |
545 | return 0; |
546 | } | |
547 | ||
19c58fb8 | 548 | static int gitdiff_copydst(const char *line, struct patch *patch) |
a4acb0eb | 549 | { |
19c58fb8 LT |
550 | patch->is_copy = 1; |
551 | patch->new_name = find_name(line, NULL, 0, 0); | |
a4acb0eb LT |
552 | return 0; |
553 | } | |
554 | ||
19c58fb8 | 555 | static int gitdiff_renamesrc(const char *line, struct patch *patch) |
a4acb0eb | 556 | { |
19c58fb8 LT |
557 | patch->is_rename = 1; |
558 | patch->old_name = find_name(line, NULL, 0, 0); | |
a4acb0eb LT |
559 | return 0; |
560 | } | |
561 | ||
19c58fb8 | 562 | static int gitdiff_renamedst(const char *line, struct patch *patch) |
a4acb0eb | 563 | { |
19c58fb8 LT |
564 | patch->is_rename = 1; |
565 | patch->new_name = find_name(line, NULL, 0, 0); | |
a4acb0eb LT |
566 | return 0; |
567 | } | |
568 | ||
19c58fb8 | 569 | static int gitdiff_similarity(const char *line, struct patch *patch) |
a4acb0eb | 570 | { |
96c912a4 JH |
571 | if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX) |
572 | patch->score = 0; | |
a4acb0eb | 573 | return 0; |
c1bb9350 LT |
574 | } |
575 | ||
70aadac0 JH |
576 | static int gitdiff_dissimilarity(const char *line, struct patch *patch) |
577 | { | |
96c912a4 JH |
578 | if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX) |
579 | patch->score = 0; | |
70aadac0 JH |
580 | return 0; |
581 | } | |
582 | ||
2cf67f1e JH |
583 | static int gitdiff_index(const char *line, struct patch *patch) |
584 | { | |
81bf96bb JH |
585 | /* |
586 | * index line is N hexadecimal, "..", N hexadecimal, | |
2cf67f1e JH |
587 | * and optional space with octal mode. |
588 | */ | |
589 | const char *ptr, *eol; | |
590 | int len; | |
591 | ||
592 | ptr = strchr(line, '.'); | |
9add69b1 | 593 | if (!ptr || ptr[1] != '.' || 40 < ptr - line) |
2cf67f1e JH |
594 | return 0; |
595 | len = ptr - line; | |
596 | memcpy(patch->old_sha1_prefix, line, len); | |
597 | patch->old_sha1_prefix[len] = 0; | |
598 | ||
599 | line = ptr + 2; | |
600 | ptr = strchr(line, ' '); | |
601 | eol = strchr(line, '\n'); | |
602 | ||
603 | if (!ptr || eol < ptr) | |
604 | ptr = eol; | |
605 | len = ptr - line; | |
606 | ||
9add69b1 | 607 | if (40 < len) |
2cf67f1e JH |
608 | return 0; |
609 | memcpy(patch->new_sha1_prefix, line, len); | |
610 | patch->new_sha1_prefix[len] = 0; | |
611 | if (*ptr == ' ') | |
612 | patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8); | |
613 | return 0; | |
614 | } | |
615 | ||
9a4a100e LT |
616 | /* |
617 | * This is normal for a diff that doesn't change anything: we'll fall through | |
618 | * into the next diff. Tell the parser to break out. | |
619 | */ | |
19c58fb8 | 620 | static int gitdiff_unrecognized(const char *line, struct patch *patch) |
9a4a100e LT |
621 | { |
622 | return -1; | |
623 | } | |
624 | ||
22943f1a JH |
625 | static const char *stop_at_slash(const char *line, int llen) |
626 | { | |
627 | int i; | |
628 | ||
629 | for (i = 0; i < llen; i++) { | |
630 | int ch = line[i]; | |
631 | if (ch == '/') | |
632 | return line + i; | |
633 | } | |
634 | return NULL; | |
635 | } | |
636 | ||
81bf96bb JH |
637 | /* |
638 | * This is to extract the same name that appears on "diff --git" | |
22943f1a JH |
639 | * line. We do not find and return anything if it is a rename |
640 | * patch, and it is OK because we will find the name elsewhere. | |
641 | * We need to reliably find name only when it is mode-change only, | |
642 | * creation or deletion of an empty file. In any of these cases, | |
643 | * both sides are the same name under a/ and b/ respectively. | |
644 | */ | |
645 | static char *git_header_name(char *line, int llen) | |
5041aa70 | 646 | { |
22943f1a JH |
647 | const char *name; |
648 | const char *second = NULL; | |
7fb1011e | 649 | size_t len; |
5041aa70 | 650 | |
22943f1a JH |
651 | line += strlen("diff --git "); |
652 | llen -= strlen("diff --git "); | |
653 | ||
654 | if (*line == '"') { | |
655 | const char *cp; | |
7fb1011e PH |
656 | struct strbuf first; |
657 | struct strbuf sp; | |
658 | ||
659 | strbuf_init(&first, 0); | |
660 | strbuf_init(&sp, 0); | |
661 | ||
662 | if (unquote_c_style(&first, line, &second)) | |
663 | goto free_and_fail1; | |
22943f1a JH |
664 | |
665 | /* advance to the first slash */ | |
7fb1011e PH |
666 | cp = stop_at_slash(first.buf, first.len); |
667 | /* we do not accept absolute paths */ | |
668 | if (!cp || cp == first.buf) | |
669 | goto free_and_fail1; | |
670 | strbuf_remove(&first, 0, cp + 1 - first.buf); | |
22943f1a | 671 | |
81bf96bb JH |
672 | /* |
673 | * second points at one past closing dq of name. | |
22943f1a JH |
674 | * find the second name. |
675 | */ | |
676 | while ((second < line + llen) && isspace(*second)) | |
677 | second++; | |
678 | ||
679 | if (line + llen <= second) | |
7fb1011e | 680 | goto free_and_fail1; |
22943f1a | 681 | if (*second == '"') { |
7fb1011e PH |
682 | if (unquote_c_style(&sp, second, NULL)) |
683 | goto free_and_fail1; | |
684 | cp = stop_at_slash(sp.buf, sp.len); | |
685 | if (!cp || cp == sp.buf) | |
686 | goto free_and_fail1; | |
22943f1a | 687 | /* They must match, otherwise ignore */ |
7fb1011e PH |
688 | if (strcmp(cp + 1, first.buf)) |
689 | goto free_and_fail1; | |
690 | strbuf_release(&sp); | |
b315c5c0 | 691 | return strbuf_detach(&first, NULL); |
22943f1a JH |
692 | } |
693 | ||
694 | /* unquoted second */ | |
695 | cp = stop_at_slash(second, line + llen - second); | |
696 | if (!cp || cp == second) | |
7fb1011e | 697 | goto free_and_fail1; |
22943f1a | 698 | cp++; |
7fb1011e PH |
699 | if (line + llen - cp != first.len + 1 || |
700 | memcmp(first.buf, cp, first.len)) | |
701 | goto free_and_fail1; | |
b315c5c0 | 702 | return strbuf_detach(&first, NULL); |
7fb1011e PH |
703 | |
704 | free_and_fail1: | |
705 | strbuf_release(&first); | |
706 | strbuf_release(&sp); | |
707 | return NULL; | |
5041aa70 LT |
708 | } |
709 | ||
22943f1a JH |
710 | /* unquoted first name */ |
711 | name = stop_at_slash(line, llen); | |
712 | if (!name || name == line) | |
5041aa70 | 713 | return NULL; |
22943f1a JH |
714 | name++; |
715 | ||
81bf96bb JH |
716 | /* |
717 | * since the first name is unquoted, a dq if exists must be | |
22943f1a JH |
718 | * the beginning of the second name. |
719 | */ | |
720 | for (second = name; second < line + llen; second++) { | |
721 | if (*second == '"') { | |
7fb1011e | 722 | struct strbuf sp; |
22943f1a | 723 | const char *np; |
7fb1011e PH |
724 | |
725 | strbuf_init(&sp, 0); | |
726 | if (unquote_c_style(&sp, second, NULL)) | |
727 | goto free_and_fail2; | |
728 | ||
729 | np = stop_at_slash(sp.buf, sp.len); | |
730 | if (!np || np == sp.buf) | |
731 | goto free_and_fail2; | |
22943f1a | 732 | np++; |
7fb1011e PH |
733 | |
734 | len = sp.buf + sp.len - np; | |
735 | if (len < second - name && | |
22943f1a JH |
736 | !strncmp(np, name, len) && |
737 | isspace(name[len])) { | |
738 | /* Good */ | |
7fb1011e | 739 | strbuf_remove(&sp, 0, np - sp.buf); |
b315c5c0 | 740 | return strbuf_detach(&sp, NULL); |
22943f1a | 741 | } |
7fb1011e PH |
742 | |
743 | free_and_fail2: | |
744 | strbuf_release(&sp); | |
745 | return NULL; | |
22943f1a JH |
746 | } |
747 | } | |
748 | ||
5041aa70 LT |
749 | /* |
750 | * Accept a name only if it shows up twice, exactly the same | |
751 | * form. | |
752 | */ | |
753 | for (len = 0 ; ; len++) { | |
dd305c84 | 754 | switch (name[len]) { |
5041aa70 LT |
755 | default: |
756 | continue; | |
757 | case '\n': | |
e70a165d | 758 | return NULL; |
5041aa70 LT |
759 | case '\t': case ' ': |
760 | second = name+len; | |
761 | for (;;) { | |
762 | char c = *second++; | |
763 | if (c == '\n') | |
764 | return NULL; | |
765 | if (c == '/') | |
766 | break; | |
767 | } | |
0e87e048 | 768 | if (second[len] == '\n' && !memcmp(name, second, len)) { |
182af834 | 769 | return xmemdupz(name, len); |
5041aa70 LT |
770 | } |
771 | } | |
772 | } | |
5041aa70 LT |
773 | } |
774 | ||
c1bb9350 | 775 | /* Verify that we recognize the lines following a git header */ |
19c58fb8 | 776 | static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch) |
c1bb9350 | 777 | { |
a4acb0eb LT |
778 | unsigned long offset; |
779 | ||
780 | /* A git diff has explicit new/delete information, so we don't guess */ | |
19c58fb8 LT |
781 | patch->is_new = 0; |
782 | patch->is_delete = 0; | |
a4acb0eb | 783 | |
5041aa70 LT |
784 | /* |
785 | * Some things may not have the old name in the | |
786 | * rest of the headers anywhere (pure mode changes, | |
787 | * or removing or adding empty files), so we get | |
788 | * the default name from the header. | |
789 | */ | |
22943f1a | 790 | patch->def_name = git_header_name(line, len); |
5041aa70 | 791 | |
a4acb0eb LT |
792 | line += len; |
793 | size -= len; | |
794 | linenr++; | |
795 | for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) { | |
796 | static const struct opentry { | |
797 | const char *str; | |
19c58fb8 | 798 | int (*fn)(const char *, struct patch *); |
a4acb0eb LT |
799 | } optable[] = { |
800 | { "@@ -", gitdiff_hdrend }, | |
801 | { "--- ", gitdiff_oldname }, | |
802 | { "+++ ", gitdiff_newname }, | |
803 | { "old mode ", gitdiff_oldmode }, | |
804 | { "new mode ", gitdiff_newmode }, | |
805 | { "deleted file mode ", gitdiff_delete }, | |
806 | { "new file mode ", gitdiff_newfile }, | |
807 | { "copy from ", gitdiff_copysrc }, | |
808 | { "copy to ", gitdiff_copydst }, | |
33f4d087 LT |
809 | { "rename old ", gitdiff_renamesrc }, |
810 | { "rename new ", gitdiff_renamedst }, | |
dc938417 LT |
811 | { "rename from ", gitdiff_renamesrc }, |
812 | { "rename to ", gitdiff_renamedst }, | |
a4acb0eb | 813 | { "similarity index ", gitdiff_similarity }, |
70aadac0 | 814 | { "dissimilarity index ", gitdiff_dissimilarity }, |
2cf67f1e | 815 | { "index ", gitdiff_index }, |
9a4a100e | 816 | { "", gitdiff_unrecognized }, |
a4acb0eb LT |
817 | }; |
818 | int i; | |
c1bb9350 | 819 | |
c1bb9350 | 820 | len = linelen(line, size); |
a4acb0eb | 821 | if (!len || line[len-1] != '\n') |
c1bb9350 | 822 | break; |
b4f2a6ac | 823 | for (i = 0; i < ARRAY_SIZE(optable); i++) { |
a4acb0eb LT |
824 | const struct opentry *p = optable + i; |
825 | int oplen = strlen(p->str); | |
826 | if (len < oplen || memcmp(p->str, line, oplen)) | |
827 | continue; | |
19c58fb8 | 828 | if (p->fn(line + oplen, patch) < 0) |
a4acb0eb | 829 | return offset; |
9a4a100e | 830 | break; |
a4acb0eb | 831 | } |
c1bb9350 LT |
832 | } |
833 | ||
a4acb0eb | 834 | return offset; |
c1bb9350 LT |
835 | } |
836 | ||
fab2c257 | 837 | static int parse_num(const char *line, unsigned long *p) |
46979f56 LT |
838 | { |
839 | char *ptr; | |
fab2c257 LT |
840 | |
841 | if (!isdigit(*line)) | |
842 | return 0; | |
843 | *p = strtoul(line, &ptr, 10); | |
844 | return ptr - line; | |
845 | } | |
846 | ||
847 | static int parse_range(const char *line, int len, int offset, const char *expect, | |
81bf96bb | 848 | unsigned long *p1, unsigned long *p2) |
fab2c257 | 849 | { |
46979f56 LT |
850 | int digits, ex; |
851 | ||
852 | if (offset < 0 || offset >= len) | |
853 | return -1; | |
854 | line += offset; | |
855 | len -= offset; | |
856 | ||
fab2c257 LT |
857 | digits = parse_num(line, p1); |
858 | if (!digits) | |
46979f56 | 859 | return -1; |
46979f56 LT |
860 | |
861 | offset += digits; | |
862 | line += digits; | |
863 | len -= digits; | |
864 | ||
c1504628 | 865 | *p2 = 1; |
fab2c257 LT |
866 | if (*line == ',') { |
867 | digits = parse_num(line+1, p2); | |
868 | if (!digits) | |
869 | return -1; | |
870 | ||
871 | offset += digits+1; | |
872 | line += digits+1; | |
873 | len -= digits+1; | |
874 | } | |
875 | ||
46979f56 LT |
876 | ex = strlen(expect); |
877 | if (ex > len) | |
878 | return -1; | |
879 | if (memcmp(line, expect, ex)) | |
880 | return -1; | |
881 | ||
882 | return offset + ex; | |
883 | } | |
884 | ||
885 | /* | |
886 | * Parse a unified diff fragment header of the | |
887 | * form "@@ -a,b +c,d @@" | |
888 | */ | |
19c58fb8 | 889 | static int parse_fragment_header(char *line, int len, struct fragment *fragment) |
46979f56 LT |
890 | { |
891 | int offset; | |
892 | ||
893 | if (!len || line[len-1] != '\n') | |
894 | return -1; | |
895 | ||
896 | /* Figure out the number of lines in a fragment */ | |
fab2c257 LT |
897 | offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines); |
898 | offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines); | |
46979f56 LT |
899 | |
900 | return offset; | |
901 | } | |
902 | ||
19c58fb8 | 903 | static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch) |
c1bb9350 LT |
904 | { |
905 | unsigned long offset, len; | |
906 | ||
9987d7c5 | 907 | patch->is_toplevel_relative = 0; |
19c58fb8 LT |
908 | patch->is_rename = patch->is_copy = 0; |
909 | patch->is_new = patch->is_delete = -1; | |
910 | patch->old_mode = patch->new_mode = 0; | |
911 | patch->old_name = patch->new_name = NULL; | |
46979f56 | 912 | for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) { |
c1bb9350 LT |
913 | unsigned long nextlen; |
914 | ||
915 | len = linelen(line, size); | |
916 | if (!len) | |
917 | break; | |
918 | ||
919 | /* Testing this early allows us to take a few shortcuts.. */ | |
920 | if (len < 6) | |
921 | continue; | |
46979f56 LT |
922 | |
923 | /* | |
82e5a82f | 924 | * Make sure we don't find any unconnected patch fragments. |
46979f56 LT |
925 | * That's a sign that we didn't find a header, and that a |
926 | * patch has become corrupted/broken up. | |
927 | */ | |
928 | if (!memcmp("@@ -", line, 4)) { | |
19c58fb8 LT |
929 | struct fragment dummy; |
930 | if (parse_fragment_header(line, len, &dummy) < 0) | |
46979f56 | 931 | continue; |
65341411 JH |
932 | die("patch fragment without header at line %d: %.*s", |
933 | linenr, (int)len-1, line); | |
46979f56 LT |
934 | } |
935 | ||
c1bb9350 LT |
936 | if (size < len + 6) |
937 | break; | |
938 | ||
939 | /* | |
940 | * Git patch? It might not have a real patch, just a rename | |
941 | * or mode change, so we handle that specially | |
942 | */ | |
943 | if (!memcmp("diff --git ", line, 11)) { | |
19c58fb8 | 944 | int git_hdr_len = parse_git_header(line, len, size, patch); |
206de27e | 945 | if (git_hdr_len <= len) |
c1bb9350 | 946 | continue; |
b7e8039a LT |
947 | if (!patch->old_name && !patch->new_name) { |
948 | if (!patch->def_name) | |
949 | die("git diff header lacks filename information (line %d)", linenr); | |
950 | patch->old_name = patch->new_name = patch->def_name; | |
951 | } | |
9987d7c5 | 952 | patch->is_toplevel_relative = 1; |
a4acb0eb | 953 | *hdrsize = git_hdr_len; |
c1bb9350 LT |
954 | return offset; |
955 | } | |
956 | ||
81bf96bb | 957 | /* --- followed by +++ ? */ |
c1bb9350 LT |
958 | if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4)) |
959 | continue; | |
960 | ||
961 | /* | |
962 | * We only accept unified patches, so we want it to | |
963 | * at least have "@@ -a,b +c,d @@\n", which is 14 chars | |
81bf96bb | 964 | * minimum ("@@ -0,0 +1 @@\n" is the shortest). |
c1bb9350 LT |
965 | */ |
966 | nextlen = linelen(line + len, size - len); | |
967 | if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4)) | |
968 | continue; | |
969 | ||
970 | /* Ok, we'll consider it a patch */ | |
19c58fb8 | 971 | parse_traditional_patch(line, line+len, patch); |
c1bb9350 | 972 | *hdrsize = len + nextlen; |
46979f56 | 973 | linenr += 2; |
c1bb9350 LT |
974 | return offset; |
975 | } | |
976 | return -1; | |
977 | } | |
978 | ||
cf1b7869 | 979 | static void check_whitespace(const char *line, int len, unsigned ws_rule) |
d0c25035 | 980 | { |
c1795bb0 | 981 | char *err; |
8f8841e9 | 982 | unsigned result = ws_check(line + 1, len - 1, ws_rule); |
c1795bb0 WC |
983 | if (!result) |
984 | return; | |
d0c25035 | 985 | |
d0c25035 JH |
986 | whitespace_error++; |
987 | if (squelch_whitespace_errors && | |
988 | squelch_whitespace_errors < whitespace_error) | |
989 | ; | |
c1795bb0 WC |
990 | else { |
991 | err = whitespace_error_string(result); | |
45e2a4b2 | 992 | fprintf(stderr, "%s:%d: %s.\n%.*s\n", |
8f8841e9 | 993 | patch_input_file, linenr, err, len - 2, line + 1); |
c1795bb0 WC |
994 | free(err); |
995 | } | |
d0c25035 JH |
996 | } |
997 | ||
c1bb9350 | 998 | /* |
4be60962 JH |
999 | * Parse a unified diff. Note that this really needs to parse each |
1000 | * fragment separately, since the only way to know the difference | |
1001 | * between a "---" that is part of a patch, and a "---" that starts | |
1002 | * the next patch is to look at the line counts.. | |
c1bb9350 | 1003 | */ |
81bf96bb JH |
1004 | static int parse_fragment(char *line, unsigned long size, |
1005 | struct patch *patch, struct fragment *fragment) | |
c1bb9350 | 1006 | { |
3f40315a | 1007 | int added, deleted; |
c1bb9350 | 1008 | int len = linelen(line, size), offset; |
30996652 | 1009 | unsigned long oldlines, newlines; |
47495887 | 1010 | unsigned long leading, trailing; |
c1bb9350 | 1011 | |
19c58fb8 | 1012 | offset = parse_fragment_header(line, len, fragment); |
c1bb9350 LT |
1013 | if (offset < 0) |
1014 | return -1; | |
19c58fb8 LT |
1015 | oldlines = fragment->oldlines; |
1016 | newlines = fragment->newlines; | |
47495887 EB |
1017 | leading = 0; |
1018 | trailing = 0; | |
c1bb9350 LT |
1019 | |
1020 | /* Parse the thing.. */ | |
1021 | line += len; | |
1022 | size -= len; | |
46979f56 | 1023 | linenr++; |
3f40315a | 1024 | added = deleted = 0; |
4be60962 JH |
1025 | for (offset = len; |
1026 | 0 < size; | |
1027 | offset += len, size -= len, line += len, linenr++) { | |
c1bb9350 LT |
1028 | if (!oldlines && !newlines) |
1029 | break; | |
1030 | len = linelen(line, size); | |
1031 | if (!len || line[len-1] != '\n') | |
1032 | return -1; | |
1033 | switch (*line) { | |
1034 | default: | |
1035 | return -1; | |
b507b465 | 1036 | case '\n': /* newer GNU diff, an empty context line */ |
c1bb9350 LT |
1037 | case ' ': |
1038 | oldlines--; | |
1039 | newlines--; | |
47495887 EB |
1040 | if (!deleted && !added) |
1041 | leading++; | |
1042 | trailing++; | |
c1bb9350 LT |
1043 | break; |
1044 | case '-': | |
5fda48d6 | 1045 | if (apply_in_reverse && |
81bf96bb | 1046 | ws_error_action != nowarn_ws_error) |
cf1b7869 | 1047 | check_whitespace(line, len, patch->ws_rule); |
3f40315a | 1048 | deleted++; |
c1bb9350 | 1049 | oldlines--; |
47495887 | 1050 | trailing = 0; |
c1bb9350 LT |
1051 | break; |
1052 | case '+': | |
5fda48d6 | 1053 | if (!apply_in_reverse && |
81bf96bb | 1054 | ws_error_action != nowarn_ws_error) |
cf1b7869 | 1055 | check_whitespace(line, len, patch->ws_rule); |
3f40315a | 1056 | added++; |
c1bb9350 | 1057 | newlines--; |
47495887 | 1058 | trailing = 0; |
c1bb9350 | 1059 | break; |
433ef8a2 | 1060 | |
81bf96bb JH |
1061 | /* |
1062 | * We allow "\ No newline at end of file". Depending | |
433ef8a2 FK |
1063 | * on locale settings when the patch was produced we |
1064 | * don't know what this line looks like. The only | |
56d33b11 JH |
1065 | * thing we do know is that it begins with "\ ". |
1066 | * Checking for 12 is just for sanity check -- any | |
1067 | * l10n of "\ No newline..." is at least that long. | |
1068 | */ | |
fab2c257 | 1069 | case '\\': |
433ef8a2 | 1070 | if (len < 12 || memcmp(line, "\\ ", 2)) |
3cca928d | 1071 | return -1; |
fab2c257 | 1072 | break; |
c1bb9350 LT |
1073 | } |
1074 | } | |
c1504628 LT |
1075 | if (oldlines || newlines) |
1076 | return -1; | |
47495887 EB |
1077 | fragment->leading = leading; |
1078 | fragment->trailing = trailing; | |
1079 | ||
81bf96bb JH |
1080 | /* |
1081 | * If a fragment ends with an incomplete line, we failed to include | |
8b64647d JH |
1082 | * it in the above loop because we hit oldlines == newlines == 0 |
1083 | * before seeing it. | |
1084 | */ | |
433ef8a2 | 1085 | if (12 < size && !memcmp(line, "\\ ", 2)) |
8b64647d JH |
1086 | offset += linelen(line, size); |
1087 | ||
3f40315a LT |
1088 | patch->lines_added += added; |
1089 | patch->lines_deleted += deleted; | |
4be60962 JH |
1090 | |
1091 | if (0 < patch->is_new && oldlines) | |
1092 | return error("new file depends on old contents"); | |
1093 | if (0 < patch->is_delete && newlines) | |
1094 | return error("deleted file still has contents"); | |
c1bb9350 LT |
1095 | return offset; |
1096 | } | |
1097 | ||
19c58fb8 | 1098 | static int parse_single_patch(char *line, unsigned long size, struct patch *patch) |
c1bb9350 LT |
1099 | { |
1100 | unsigned long offset = 0; | |
4be60962 | 1101 | unsigned long oldlines = 0, newlines = 0, context = 0; |
19c58fb8 | 1102 | struct fragment **fragp = &patch->fragments; |
c1bb9350 LT |
1103 | |
1104 | while (size > 4 && !memcmp(line, "@@ -", 4)) { | |
19c58fb8 LT |
1105 | struct fragment *fragment; |
1106 | int len; | |
1107 | ||
90321c10 | 1108 | fragment = xcalloc(1, sizeof(*fragment)); |
19c58fb8 | 1109 | len = parse_fragment(line, size, patch, fragment); |
c1bb9350 | 1110 | if (len <= 0) |
46979f56 | 1111 | die("corrupt patch at line %d", linenr); |
19c58fb8 LT |
1112 | fragment->patch = line; |
1113 | fragment->size = len; | |
4be60962 JH |
1114 | oldlines += fragment->oldlines; |
1115 | newlines += fragment->newlines; | |
1116 | context += fragment->leading + fragment->trailing; | |
19c58fb8 LT |
1117 | |
1118 | *fragp = fragment; | |
1119 | fragp = &fragment->next; | |
c1bb9350 LT |
1120 | |
1121 | offset += len; | |
1122 | line += len; | |
1123 | size -= len; | |
1124 | } | |
4be60962 JH |
1125 | |
1126 | /* | |
1127 | * If something was removed (i.e. we have old-lines) it cannot | |
1128 | * be creation, and if something was added it cannot be | |
1129 | * deletion. However, the reverse is not true; --unified=0 | |
1130 | * patches that only add are not necessarily creation even | |
1131 | * though they do not have any old lines, and ones that only | |
1132 | * delete are not necessarily deletion. | |
1133 | * | |
1134 | * Unfortunately, a real creation/deletion patch do _not_ have | |
1135 | * any context line by definition, so we cannot safely tell it | |
1136 | * apart with --unified=0 insanity. At least if the patch has | |
1137 | * more than one hunk it is not creation or deletion. | |
1138 | */ | |
1139 | if (patch->is_new < 0 && | |
1140 | (oldlines || (patch->fragments && patch->fragments->next))) | |
1141 | patch->is_new = 0; | |
1142 | if (patch->is_delete < 0 && | |
1143 | (newlines || (patch->fragments && patch->fragments->next))) | |
1144 | patch->is_delete = 0; | |
4be60962 JH |
1145 | |
1146 | if (0 < patch->is_new && oldlines) | |
1147 | die("new file %s depends on old contents", patch->new_name); | |
1148 | if (0 < patch->is_delete && newlines) | |
1149 | die("deleted file %s still has contents", patch->old_name); | |
1150 | if (!patch->is_delete && !newlines && context) | |
1151 | fprintf(stderr, "** warning: file %s becomes empty but " | |
1152 | "is not deleted\n", patch->new_name); | |
1153 | ||
c1bb9350 LT |
1154 | return offset; |
1155 | } | |
1156 | ||
1fea629f LT |
1157 | static inline int metadata_changes(struct patch *patch) |
1158 | { | |
1159 | return patch->is_rename > 0 || | |
1160 | patch->is_copy > 0 || | |
1161 | patch->is_new > 0 || | |
1162 | patch->is_delete || | |
1163 | (patch->old_mode && patch->new_mode && | |
1164 | patch->old_mode != patch->new_mode); | |
1165 | } | |
1166 | ||
3cd4f5e8 JH |
1167 | static char *inflate_it(const void *data, unsigned long size, |
1168 | unsigned long inflated_size) | |
051308f6 | 1169 | { |
3cd4f5e8 JH |
1170 | z_stream stream; |
1171 | void *out; | |
1172 | int st; | |
1173 | ||
1174 | memset(&stream, 0, sizeof(stream)); | |
1175 | ||
1176 | stream.next_in = (unsigned char *)data; | |
1177 | stream.avail_in = size; | |
1178 | stream.next_out = out = xmalloc(inflated_size); | |
1179 | stream.avail_out = inflated_size; | |
1180 | inflateInit(&stream); | |
1181 | st = inflate(&stream, Z_FINISH); | |
1182 | if ((st != Z_STREAM_END) || stream.total_out != inflated_size) { | |
1183 | free(out); | |
1184 | return NULL; | |
1185 | } | |
1186 | return out; | |
1187 | } | |
1188 | ||
1189 | static struct fragment *parse_binary_hunk(char **buf_p, | |
1190 | unsigned long *sz_p, | |
1191 | int *status_p, | |
1192 | int *used_p) | |
1193 | { | |
81bf96bb JH |
1194 | /* |
1195 | * Expect a line that begins with binary patch method ("literal" | |
3cd4f5e8 JH |
1196 | * or "delta"), followed by the length of data before deflating. |
1197 | * a sequence of 'length-byte' followed by base-85 encoded data | |
1198 | * should follow, terminated by a newline. | |
051308f6 JH |
1199 | * |
1200 | * Each 5-byte sequence of base-85 encodes up to 4 bytes, | |
1201 | * and we would limit the patch line to 66 characters, | |
1202 | * so one line can fit up to 13 groups that would decode | |
1203 | * to 52 bytes max. The length byte 'A'-'Z' corresponds | |
1204 | * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes. | |
051308f6 JH |
1205 | */ |
1206 | int llen, used; | |
3cd4f5e8 JH |
1207 | unsigned long size = *sz_p; |
1208 | char *buffer = *buf_p; | |
1209 | int patch_method; | |
1210 | unsigned long origlen; | |
0660626c | 1211 | char *data = NULL; |
3cd4f5e8 JH |
1212 | int hunk_size = 0; |
1213 | struct fragment *frag; | |
051308f6 | 1214 | |
0660626c JH |
1215 | llen = linelen(buffer, size); |
1216 | used = llen; | |
3cd4f5e8 JH |
1217 | |
1218 | *status_p = 0; | |
0660626c | 1219 | |
cc44c765 | 1220 | if (!prefixcmp(buffer, "delta ")) { |
3cd4f5e8 JH |
1221 | patch_method = BINARY_DELTA_DEFLATED; |
1222 | origlen = strtoul(buffer + 6, NULL, 10); | |
0660626c | 1223 | } |
cc44c765 | 1224 | else if (!prefixcmp(buffer, "literal ")) { |
3cd4f5e8 JH |
1225 | patch_method = BINARY_LITERAL_DEFLATED; |
1226 | origlen = strtoul(buffer + 8, NULL, 10); | |
0660626c JH |
1227 | } |
1228 | else | |
3cd4f5e8 JH |
1229 | return NULL; |
1230 | ||
1231 | linenr++; | |
0660626c | 1232 | buffer += llen; |
051308f6 JH |
1233 | while (1) { |
1234 | int byte_length, max_byte_length, newsize; | |
1235 | llen = linelen(buffer, size); | |
1236 | used += llen; | |
1237 | linenr++; | |
03eb8f8a JH |
1238 | if (llen == 1) { |
1239 | /* consume the blank line */ | |
1240 | buffer++; | |
1241 | size--; | |
051308f6 | 1242 | break; |
03eb8f8a | 1243 | } |
81bf96bb JH |
1244 | /* |
1245 | * Minimum line is "A00000\n" which is 7-byte long, | |
051308f6 JH |
1246 | * and the line length must be multiple of 5 plus 2. |
1247 | */ | |
1248 | if ((llen < 7) || (llen-2) % 5) | |
1249 | goto corrupt; | |
1250 | max_byte_length = (llen - 2) / 5 * 4; | |
1251 | byte_length = *buffer; | |
1252 | if ('A' <= byte_length && byte_length <= 'Z') | |
1253 | byte_length = byte_length - 'A' + 1; | |
1254 | else if ('a' <= byte_length && byte_length <= 'z') | |
1255 | byte_length = byte_length - 'a' + 27; | |
1256 | else | |
1257 | goto corrupt; | |
1258 | /* if the input length was not multiple of 4, we would | |
1259 | * have filler at the end but the filler should never | |
1260 | * exceed 3 bytes | |
1261 | */ | |
1262 | if (max_byte_length < byte_length || | |
1263 | byte_length <= max_byte_length - 4) | |
1264 | goto corrupt; | |
3cd4f5e8 | 1265 | newsize = hunk_size + byte_length; |
0660626c | 1266 | data = xrealloc(data, newsize); |
3cd4f5e8 | 1267 | if (decode_85(data + hunk_size, buffer + 1, byte_length)) |
051308f6 | 1268 | goto corrupt; |
3cd4f5e8 | 1269 | hunk_size = newsize; |
051308f6 JH |
1270 | buffer += llen; |
1271 | size -= llen; | |
1272 | } | |
3cd4f5e8 JH |
1273 | |
1274 | frag = xcalloc(1, sizeof(*frag)); | |
1275 | frag->patch = inflate_it(data, hunk_size, origlen); | |
1276 | if (!frag->patch) | |
1277 | goto corrupt; | |
1278 | free(data); | |
1279 | frag->size = origlen; | |
1280 | *buf_p = buffer; | |
1281 | *sz_p = size; | |
1282 | *used_p = used; | |
1283 | frag->binary_patch_method = patch_method; | |
1284 | return frag; | |
1285 | ||
051308f6 | 1286 | corrupt: |
4cac42b1 | 1287 | free(data); |
3cd4f5e8 JH |
1288 | *status_p = -1; |
1289 | error("corrupt binary patch at line %d: %.*s", | |
1290 | linenr-1, llen-1, buffer); | |
1291 | return NULL; | |
1292 | } | |
1293 | ||
1294 | static int parse_binary(char *buffer, unsigned long size, struct patch *patch) | |
1295 | { | |
81bf96bb JH |
1296 | /* |
1297 | * We have read "GIT binary patch\n"; what follows is a line | |
3cd4f5e8 JH |
1298 | * that says the patch method (currently, either "literal" or |
1299 | * "delta") and the length of data before deflating; a | |
1300 | * sequence of 'length-byte' followed by base-85 encoded data | |
1301 | * follows. | |
1302 | * | |
1303 | * When a binary patch is reversible, there is another binary | |
1304 | * hunk in the same format, starting with patch method (either | |
1305 | * "literal" or "delta") with the length of data, and a sequence | |
1306 | * of length-byte + base-85 encoded data, terminated with another | |
1307 | * empty line. This data, when applied to the postimage, produces | |
1308 | * the preimage. | |
1309 | */ | |
1310 | struct fragment *forward; | |
1311 | struct fragment *reverse; | |
1312 | int status; | |
1313 | int used, used_1; | |
1314 | ||
1315 | forward = parse_binary_hunk(&buffer, &size, &status, &used); | |
1316 | if (!forward && !status) | |
1317 | /* there has to be one hunk (forward hunk) */ | |
1318 | return error("unrecognized binary patch at line %d", linenr-1); | |
1319 | if (status) | |
1320 | /* otherwise we already gave an error message */ | |
1321 | return status; | |
1322 | ||
1323 | reverse = parse_binary_hunk(&buffer, &size, &status, &used_1); | |
1324 | if (reverse) | |
1325 | used += used_1; | |
1326 | else if (status) { | |
81bf96bb JH |
1327 | /* |
1328 | * Not having reverse hunk is not an error, but having | |
3cd4f5e8 JH |
1329 | * a corrupt reverse hunk is. |
1330 | */ | |
1331 | free((void*) forward->patch); | |
1332 | free(forward); | |
1333 | return status; | |
1334 | } | |
1335 | forward->next = reverse; | |
1336 | patch->fragments = forward; | |
1337 | patch->is_binary = 1; | |
1338 | return used; | |
051308f6 JH |
1339 | } |
1340 | ||
19c58fb8 | 1341 | static int parse_chunk(char *buffer, unsigned long size, struct patch *patch) |
c1bb9350 LT |
1342 | { |
1343 | int hdrsize, patchsize; | |
19c58fb8 | 1344 | int offset = find_header(buffer, size, &hdrsize, patch); |
c1bb9350 LT |
1345 | |
1346 | if (offset < 0) | |
1347 | return offset; | |
c1bb9350 | 1348 | |
cf1b7869 JH |
1349 | patch->ws_rule = whitespace_rule(patch->new_name |
1350 | ? patch->new_name | |
1351 | : patch->old_name); | |
1352 | ||
81bf96bb JH |
1353 | patchsize = parse_single_patch(buffer + offset + hdrsize, |
1354 | size - offset - hdrsize, patch); | |
c1bb9350 | 1355 | |
92927ed0 | 1356 | if (!patchsize) { |
3200d1ae JH |
1357 | static const char *binhdr[] = { |
1358 | "Binary files ", | |
1359 | "Files ", | |
1360 | NULL, | |
1361 | }; | |
051308f6 | 1362 | static const char git_binary[] = "GIT binary patch\n"; |
3200d1ae JH |
1363 | int i; |
1364 | int hd = hdrsize + offset; | |
1365 | unsigned long llen = linelen(buffer + hd, size - hd); | |
1366 | ||
051308f6 JH |
1367 | if (llen == sizeof(git_binary) - 1 && |
1368 | !memcmp(git_binary, buffer + hd, llen)) { | |
1369 | int used; | |
1370 | linenr++; | |
1371 | used = parse_binary(buffer + hd + llen, | |
1372 | size - hd - llen, patch); | |
1373 | if (used) | |
1374 | patchsize = used + llen; | |
1375 | else | |
1376 | patchsize = 0; | |
1377 | } | |
1378 | else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) { | |
3200d1ae JH |
1379 | for (i = 0; binhdr[i]; i++) { |
1380 | int len = strlen(binhdr[i]); | |
1381 | if (len < size - hd && | |
1382 | !memcmp(binhdr[i], buffer + hd, len)) { | |
051308f6 | 1383 | linenr++; |
3200d1ae | 1384 | patch->is_binary = 1; |
051308f6 | 1385 | patchsize = llen; |
3200d1ae JH |
1386 | break; |
1387 | } | |
1388 | } | |
051308f6 | 1389 | } |
ff36de08 | 1390 | |
2b6eef94 JH |
1391 | /* Empty patch cannot be applied if it is a text patch |
1392 | * without metadata change. A binary patch appears | |
1393 | * empty to us here. | |
92927ed0 JH |
1394 | */ |
1395 | if ((apply || check) && | |
2b6eef94 | 1396 | (!patch->is_binary && !metadata_changes(patch))) |
ff36de08 JH |
1397 | die("patch with only garbage at line %d", linenr); |
1398 | } | |
1fea629f | 1399 | |
c1bb9350 LT |
1400 | return offset + hdrsize + patchsize; |
1401 | } | |
1402 | ||
e5a94313 JS |
1403 | #define swap(a,b) myswap((a),(b),sizeof(a)) |
1404 | ||
1405 | #define myswap(a, b, size) do { \ | |
1406 | unsigned char mytmp[size]; \ | |
1407 | memcpy(mytmp, &a, size); \ | |
1408 | memcpy(&a, &b, size); \ | |
1409 | memcpy(&b, mytmp, size); \ | |
1410 | } while (0) | |
1411 | ||
1412 | static void reverse_patches(struct patch *p) | |
1413 | { | |
1414 | for (; p; p = p->next) { | |
1415 | struct fragment *frag = p->fragments; | |
1416 | ||
1417 | swap(p->new_name, p->old_name); | |
1418 | swap(p->new_mode, p->old_mode); | |
1419 | swap(p->is_new, p->is_delete); | |
1420 | swap(p->lines_added, p->lines_deleted); | |
1421 | swap(p->old_sha1_prefix, p->new_sha1_prefix); | |
1422 | ||
1423 | for (; frag; frag = frag->next) { | |
1424 | swap(frag->newpos, frag->oldpos); | |
1425 | swap(frag->newlines, frag->oldlines); | |
1426 | } | |
e5a94313 JS |
1427 | } |
1428 | } | |
1429 | ||
81bf96bb JH |
1430 | static const char pluses[] = |
1431 | "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"; | |
1432 | static const char minuses[]= | |
1433 | "----------------------------------------------------------------------"; | |
3f40315a LT |
1434 | |
1435 | static void show_stats(struct patch *patch) | |
1436 | { | |
663af342 PH |
1437 | struct strbuf qname; |
1438 | char *cp = patch->new_name ? patch->new_name : patch->old_name; | |
1439 | int max, add, del; | |
3f40315a | 1440 | |
663af342 PH |
1441 | strbuf_init(&qname, 0); |
1442 | quote_c_style(cp, &qname, NULL, 0); | |
22943f1a | 1443 | |
3f40315a LT |
1444 | /* |
1445 | * "scale" the filename | |
1446 | */ | |
3f40315a LT |
1447 | max = max_len; |
1448 | if (max > 50) | |
1449 | max = 50; | |
663af342 PH |
1450 | |
1451 | if (qname.len > max) { | |
1452 | cp = strchr(qname.buf + qname.len + 3 - max, '/'); | |
1453 | if (!cp) | |
1454 | cp = qname.buf + qname.len + 3 - max; | |
1455 | strbuf_splice(&qname, 0, cp - qname.buf, "...", 3); | |
1456 | } | |
1457 | ||
1458 | if (patch->is_binary) { | |
1459 | printf(" %-*s | Bin\n", max, qname.buf); | |
1460 | strbuf_release(&qname); | |
1461 | return; | |
62917097 | 1462 | } |
663af342 PH |
1463 | |
1464 | printf(" %-*s |", max, qname.buf); | |
1465 | strbuf_release(&qname); | |
3f40315a LT |
1466 | |
1467 | /* | |
1468 | * scale the add/delete | |
1469 | */ | |
663af342 | 1470 | max = max + max_change > 70 ? 70 - max : max_change; |
95bedc9e LT |
1471 | add = patch->lines_added; |
1472 | del = patch->lines_deleted; | |
95bedc9e | 1473 | |
69f956e1 | 1474 | if (max_change > 0) { |
663af342 | 1475 | int total = ((add + del) * max + max_change / 2) / max_change; |
69f956e1 SV |
1476 | add = (add * max + max_change / 2) / max_change; |
1477 | del = total - add; | |
1478 | } | |
663af342 PH |
1479 | printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted, |
1480 | add, pluses, del, minuses); | |
3f40315a LT |
1481 | } |
1482 | ||
c7f9cb14 | 1483 | static int read_old_data(struct stat *st, const char *path, struct strbuf *buf) |
3cca928d | 1484 | { |
3cca928d LT |
1485 | switch (st->st_mode & S_IFMT) { |
1486 | case S_IFLNK: | |
c7f9cb14 PH |
1487 | strbuf_grow(buf, st->st_size); |
1488 | if (readlink(path, buf->buf, st->st_size) != st->st_size) | |
1489 | return -1; | |
1490 | strbuf_setlen(buf, st->st_size); | |
1491 | return 0; | |
3cca928d | 1492 | case S_IFREG: |
387e7e19 PH |
1493 | if (strbuf_read_file(buf, path, st->st_size) != st->st_size) |
1494 | return error("unable to open or read %s", path); | |
21e5ad50 | 1495 | convert_to_git(path, buf->buf, buf->len, buf, 0); |
c7f9cb14 | 1496 | return 0; |
3cca928d LT |
1497 | default: |
1498 | return -1; | |
1499 | } | |
1500 | } | |
1501 | ||
c1beba5b JH |
1502 | static void update_pre_post_images(struct image *preimage, |
1503 | struct image *postimage, | |
1504 | char *buf, | |
1505 | size_t len) | |
3cca928d | 1506 | { |
c1beba5b JH |
1507 | int i, ctx; |
1508 | char *new, *old, *fixed; | |
1509 | struct image fixed_preimage; | |
3cca928d | 1510 | |
c1beba5b JH |
1511 | /* |
1512 | * Update the preimage with whitespace fixes. Note that we | |
1513 | * are not losing preimage->buf -- apply_one_fragment() will | |
1514 | * free "oldlines". | |
1515 | */ | |
1516 | prepare_image(&fixed_preimage, buf, len, 1); | |
1517 | assert(fixed_preimage.nr == preimage->nr); | |
1518 | for (i = 0; i < preimage->nr; i++) | |
1519 | fixed_preimage.line[i].flag = preimage->line[i].flag; | |
1520 | free(preimage->line_allocated); | |
1521 | *preimage = fixed_preimage; | |
3cca928d | 1522 | |
c1beba5b JH |
1523 | /* |
1524 | * Adjust the common context lines in postimage, in place. | |
1525 | * This is possible because whitespace fixing does not make | |
1526 | * the string grow. | |
1527 | */ | |
1528 | new = old = postimage->buf; | |
1529 | fixed = preimage->buf; | |
1530 | for (i = ctx = 0; i < postimage->nr; i++) { | |
1531 | size_t len = postimage->line[i].len; | |
1532 | if (!(postimage->line[i].flag & LINE_COMMON)) { | |
1533 | /* an added line -- no counterparts in preimage */ | |
1534 | memmove(new, old, len); | |
1535 | old += len; | |
1536 | new += len; | |
1537 | continue; | |
3cca928d | 1538 | } |
c1beba5b JH |
1539 | |
1540 | /* a common context -- skip it in the original postimage */ | |
1541 | old += len; | |
1542 | ||
1543 | /* and find the corresponding one in the fixed preimage */ | |
1544 | while (ctx < preimage->nr && | |
1545 | !(preimage->line[ctx].flag & LINE_COMMON)) { | |
1546 | fixed += preimage->line[ctx].len; | |
1547 | ctx++; | |
1548 | } | |
1549 | if (preimage->nr <= ctx) | |
1550 | die("oops"); | |
1551 | ||
1552 | /* and copy it in, while fixing the line length */ | |
1553 | len = preimage->line[ctx].len; | |
1554 | memcpy(new, fixed, len); | |
1555 | new += len; | |
1556 | fixed += len; | |
1557 | postimage->line[i].len = len; | |
1558 | ctx++; | |
1559 | } | |
1560 | ||
1561 | /* Fix the length of the whole thing */ | |
1562 | postimage->len = new - postimage->buf; | |
1563 | } | |
1564 | ||
b94f2eda JH |
1565 | static int match_fragment(struct image *img, |
1566 | struct image *preimage, | |
1567 | struct image *postimage, | |
c89fb6b1 | 1568 | unsigned long try, |
b94f2eda | 1569 | int try_lno, |
c607aaa2 | 1570 | unsigned ws_rule, |
dc41976a | 1571 | int match_beginning, int match_end) |
c89fb6b1 | 1572 | { |
b94f2eda | 1573 | int i; |
c1beba5b | 1574 | char *fixed_buf, *buf, *orig, *target; |
b94f2eda JH |
1575 | |
1576 | if (preimage->nr + try_lno > img->nr) | |
1577 | return 0; | |
1578 | ||
1579 | if (match_beginning && try_lno) | |
c89fb6b1 | 1580 | return 0; |
dc41976a | 1581 | |
b94f2eda JH |
1582 | if (match_end && preimage->nr + try_lno != img->nr) |
1583 | return 0; | |
1584 | ||
1585 | /* Quick hash check */ | |
1586 | for (i = 0; i < preimage->nr; i++) | |
1587 | if (preimage->line[i].hash != img->line[try_lno + i].hash) | |
1588 | return 0; | |
1589 | ||
dc41976a JH |
1590 | /* |
1591 | * Do we have an exact match? If we were told to match | |
1592 | * at the end, size must be exactly at try+fragsize, | |
1593 | * otherwise try+fragsize must be still within the preimage, | |
1594 | * and either case, the old piece should match the preimage | |
1595 | * exactly. | |
1596 | */ | |
1597 | if ((match_end | |
b94f2eda JH |
1598 | ? (try + preimage->len == img->len) |
1599 | : (try + preimage->len <= img->len)) && | |
1600 | !memcmp(img->buf + try, preimage->buf, preimage->len)) | |
dc41976a JH |
1601 | return 1; |
1602 | ||
c1beba5b JH |
1603 | if (ws_error_action != correct_ws_error) |
1604 | return 0; | |
1605 | ||
dc41976a | 1606 | /* |
c1beba5b JH |
1607 | * The hunk does not apply byte-by-byte, but the hash says |
1608 | * it might with whitespace fuzz. | |
dc41976a | 1609 | */ |
c1beba5b JH |
1610 | fixed_buf = xmalloc(preimage->len + 1); |
1611 | buf = fixed_buf; | |
1612 | orig = preimage->buf; | |
1613 | target = img->buf + try; | |
1614 | for (i = 0; i < preimage->nr; i++) { | |
1615 | size_t fixlen; /* length after fixing the preimage */ | |
1616 | size_t oldlen = preimage->line[i].len; | |
1617 | size_t tgtlen = img->line[try_lno + i].len; | |
1618 | size_t tgtfixlen; /* length after fixing the target line */ | |
1619 | char tgtfixbuf[1024], *tgtfix; | |
1620 | int match; | |
1621 | ||
1622 | /* Try fixing the line in the preimage */ | |
fe3403c3 | 1623 | fixlen = ws_fix_copy(buf, orig, oldlen, ws_rule, NULL); |
c1beba5b JH |
1624 | |
1625 | /* Try fixing the line in the target */ | |
1626 | if (sizeof(tgtfixbuf) < tgtlen) | |
1627 | tgtfix = tgtfixbuf; | |
1628 | else | |
1629 | tgtfix = xmalloc(tgtlen); | |
fe3403c3 | 1630 | tgtfixlen = ws_fix_copy(tgtfix, target, tgtlen, ws_rule, NULL); |
c1beba5b JH |
1631 | |
1632 | /* | |
1633 | * If they match, either the preimage was based on | |
1634 | * a version before our tree fixed whitespace breakage, | |
1635 | * or we are lacking a whitespace-fix patch the tree | |
1636 | * the preimage was based on already had (i.e. target | |
1637 | * has whitespace breakage, the preimage doesn't). | |
1638 | * In either case, we are fixing the whitespace breakages | |
1639 | * so we might as well take the fix together with their | |
1640 | * real change. | |
1641 | */ | |
1642 | match = (tgtfixlen == fixlen && !memcmp(tgtfix, buf, fixlen)); | |
1643 | ||
1644 | if (tgtfix != tgtfixbuf) | |
1645 | free(tgtfix); | |
1646 | if (!match) | |
1647 | goto unmatch_exit; | |
1648 | ||
1649 | orig += oldlen; | |
1650 | buf += fixlen; | |
1651 | target += tgtlen; | |
3cca928d LT |
1652 | } |
1653 | ||
c1beba5b JH |
1654 | /* |
1655 | * Yes, the preimage is based on an older version that still | |
1656 | * has whitespace breakages unfixed, and fixing them makes the | |
1657 | * hunk match. Update the context lines in the postimage. | |
1658 | */ | |
1659 | update_pre_post_images(preimage, postimage, | |
1660 | fixed_buf, buf - fixed_buf); | |
1661 | return 1; | |
1662 | ||
1663 | unmatch_exit: | |
1664 | free(fixed_buf); | |
dc41976a | 1665 | return 0; |
c89fb6b1 JH |
1666 | } |
1667 | ||
b94f2eda JH |
1668 | static int find_pos(struct image *img, |
1669 | struct image *preimage, | |
1670 | struct image *postimage, | |
1671 | int line, | |
c607aaa2 | 1672 | unsigned ws_rule, |
b94f2eda | 1673 | int match_beginning, int match_end) |
3cca928d | 1674 | { |
b94f2eda JH |
1675 | int i; |
1676 | unsigned long backwards, forwards, try; | |
1677 | int backwards_lno, forwards_lno, try_lno; | |
3cca928d | 1678 | |
b94f2eda | 1679 | if (preimage->nr > img->nr) |
3cca928d LT |
1680 | return -1; |
1681 | ||
ecf4c2ec JH |
1682 | /* |
1683 | * If match_begining or match_end is specified, there is no | |
1684 | * point starting from a wrong line that will never match and | |
1685 | * wander around and wait for a match at the specified end. | |
1686 | */ | |
1687 | if (match_beginning) | |
1688 | line = 0; | |
1689 | else if (match_end) | |
1690 | line = img->nr - preimage->nr; | |
1691 | ||
52f3c81a JH |
1692 | if (line > img->nr) |
1693 | line = img->nr; | |
1694 | ||
b94f2eda JH |
1695 | try = 0; |
1696 | for (i = 0; i < line; i++) | |
1697 | try += img->line[i].len; | |
3cca928d | 1698 | |
6e7c92a9 LT |
1699 | /* |
1700 | * There's probably some smart way to do this, but I'll leave | |
1701 | * that to the smart and beautiful people. I'm simple and stupid. | |
1702 | */ | |
b94f2eda JH |
1703 | backwards = try; |
1704 | backwards_lno = line; | |
1705 | forwards = try; | |
1706 | forwards_lno = line; | |
1707 | try_lno = line; | |
fcb77bc5 | 1708 | |
6e7c92a9 | 1709 | for (i = 0; ; i++) { |
b94f2eda | 1710 | if (match_fragment(img, preimage, postimage, |
c607aaa2 | 1711 | try, try_lno, ws_rule, |
b94f2eda JH |
1712 | match_beginning, match_end)) |
1713 | return try_lno; | |
fcb77bc5 JH |
1714 | |
1715 | again: | |
b94f2eda | 1716 | if (backwards_lno == 0 && forwards_lno == img->nr) |
fcb77bc5 | 1717 | break; |
6e7c92a9 | 1718 | |
6e7c92a9 | 1719 | if (i & 1) { |
b94f2eda | 1720 | if (backwards_lno == 0) { |
fcb77bc5 JH |
1721 | i++; |
1722 | goto again; | |
6e7c92a9 | 1723 | } |
b94f2eda JH |
1724 | backwards_lno--; |
1725 | backwards -= img->line[backwards_lno].len; | |
6e7c92a9 | 1726 | try = backwards; |
b94f2eda | 1727 | try_lno = backwards_lno; |
6e7c92a9 | 1728 | } else { |
b94f2eda | 1729 | if (forwards_lno == img->nr) { |
fcb77bc5 JH |
1730 | i++; |
1731 | goto again; | |
6e7c92a9 | 1732 | } |
b94f2eda JH |
1733 | forwards += img->line[forwards_lno].len; |
1734 | forwards_lno++; | |
6e7c92a9 | 1735 | try = forwards; |
b94f2eda | 1736 | try_lno = forwards_lno; |
6e7c92a9 LT |
1737 | } |
1738 | ||
6e7c92a9 | 1739 | } |
3cca928d LT |
1740 | return -1; |
1741 | } | |
1742 | ||
b94f2eda | 1743 | static void remove_first_line(struct image *img) |
47495887 | 1744 | { |
b94f2eda JH |
1745 | img->buf += img->line[0].len; |
1746 | img->len -= img->line[0].len; | |
1747 | img->line++; | |
1748 | img->nr--; | |
47495887 EB |
1749 | } |
1750 | ||
b94f2eda | 1751 | static void remove_last_line(struct image *img) |
47495887 | 1752 | { |
b94f2eda | 1753 | img->len -= img->line[--img->nr].len; |
47495887 EB |
1754 | } |
1755 | ||
b94f2eda JH |
1756 | static void update_image(struct image *img, |
1757 | int applied_pos, | |
1758 | struct image *preimage, | |
1759 | struct image *postimage) | |
b5767dd6 | 1760 | { |
81bf96bb | 1761 | /* |
b94f2eda JH |
1762 | * remove the copy of preimage at offset in img |
1763 | * and replace it with postimage | |
81bf96bb | 1764 | */ |
b94f2eda JH |
1765 | int i, nr; |
1766 | size_t remove_count, insert_count, applied_at = 0; | |
1767 | char *result; | |
d5a41641 | 1768 | |
b94f2eda JH |
1769 | for (i = 0; i < applied_pos; i++) |
1770 | applied_at += img->line[i].len; | |
1771 | ||
1772 | remove_count = 0; | |
1773 | for (i = 0; i < preimage->nr; i++) | |
1774 | remove_count += img->line[applied_pos + i].len; | |
1775 | insert_count = postimage->len; | |
1776 | ||
1777 | /* Adjust the contents */ | |
1778 | result = xmalloc(img->len + insert_count - remove_count + 1); | |
1779 | memcpy(result, img->buf, applied_at); | |
1780 | memcpy(result + applied_at, postimage->buf, postimage->len); | |
1781 | memcpy(result + applied_at + postimage->len, | |
1782 | img->buf + (applied_at + remove_count), | |
1783 | img->len - (applied_at + remove_count)); | |
1784 | free(img->buf); | |
1785 | img->buf = result; | |
1786 | img->len += insert_count - remove_count; | |
1787 | result[img->len] = '\0'; | |
1788 | ||
1789 | /* Adjust the line table */ | |
1790 | nr = img->nr + postimage->nr - preimage->nr; | |
1791 | if (preimage->nr < postimage->nr) { | |
81bf96bb | 1792 | /* |
b94f2eda JH |
1793 | * NOTE: this knows that we never call remove_first_line() |
1794 | * on anything other than pre/post image. | |
d0c25035 | 1795 | */ |
b94f2eda JH |
1796 | img->line = xrealloc(img->line, nr * sizeof(*img->line)); |
1797 | img->line_allocated = img->line; | |
d0c25035 | 1798 | } |
b94f2eda JH |
1799 | if (preimage->nr != postimage->nr) |
1800 | memmove(img->line + applied_pos + postimage->nr, | |
1801 | img->line + applied_pos + preimage->nr, | |
1802 | (img->nr - (applied_pos + preimage->nr)) * | |
1803 | sizeof(*img->line)); | |
1804 | memcpy(img->line + applied_pos, | |
1805 | postimage->line, | |
1806 | postimage->nr * sizeof(*img->line)); | |
1807 | img->nr = nr; | |
b5767dd6 JH |
1808 | } |
1809 | ||
b94f2eda | 1810 | static int apply_one_fragment(struct image *img, struct fragment *frag, |
cf1b7869 | 1811 | int inaccurate_eof, unsigned ws_rule) |
3cca928d | 1812 | { |
65aadb92 | 1813 | int match_beginning, match_end; |
3cca928d | 1814 | const char *patch = frag->patch; |
b94f2eda | 1815 | int size = frag->size; |
61e08cca | 1816 | char *old, *new, *oldlines, *newlines; |
077e1af5 | 1817 | int new_blank_lines_at_end = 0; |
47495887 | 1818 | unsigned long leading, trailing; |
b94f2eda JH |
1819 | int pos, applied_pos; |
1820 | struct image preimage; | |
1821 | struct image postimage; | |
3cca928d | 1822 | |
c330fdd4 JH |
1823 | memset(&preimage, 0, sizeof(preimage)); |
1824 | memset(&postimage, 0, sizeof(postimage)); | |
61e08cca JH |
1825 | oldlines = xmalloc(size); |
1826 | newlines = xmalloc(size); | |
c330fdd4 | 1827 | |
61e08cca JH |
1828 | old = oldlines; |
1829 | new = newlines; | |
3cca928d | 1830 | while (size > 0) { |
e5a94313 | 1831 | char first; |
3cca928d | 1832 | int len = linelen(patch, size); |
8441a9a8 | 1833 | int plen, added; |
077e1af5 | 1834 | int added_blank_line = 0; |
3cca928d LT |
1835 | |
1836 | if (!len) | |
1837 | break; | |
1838 | ||
1839 | /* | |
1840 | * "plen" is how much of the line we should use for | |
1841 | * the actual patch data. Normally we just remove the | |
1842 | * first character on the line, but if the line is | |
1843 | * followed by "\ No newline", then we also remove the | |
1844 | * last one (which is the newline, of course). | |
1845 | */ | |
61e08cca | 1846 | plen = len - 1; |
8b64647d | 1847 | if (len < size && patch[len] == '\\') |
3cca928d | 1848 | plen--; |
e5a94313 | 1849 | first = *patch; |
f686d030 | 1850 | if (apply_in_reverse) { |
e5a94313 JS |
1851 | if (first == '-') |
1852 | first = '+'; | |
1853 | else if (first == '+') | |
1854 | first = '-'; | |
1855 | } | |
efe7f358 | 1856 | |
e5a94313 | 1857 | switch (first) { |
b507b465 LT |
1858 | case '\n': |
1859 | /* Newer GNU diff, empty context line */ | |
1860 | if (plen < 0) | |
1861 | /* ... followed by '\No newline'; nothing */ | |
1862 | break; | |
61e08cca JH |
1863 | *old++ = '\n'; |
1864 | *new++ = '\n'; | |
c330fdd4 JH |
1865 | add_line_info(&preimage, "\n", 1, LINE_COMMON); |
1866 | add_line_info(&postimage, "\n", 1, LINE_COMMON); | |
b507b465 | 1867 | break; |
3cca928d LT |
1868 | case ' ': |
1869 | case '-': | |
61e08cca JH |
1870 | memcpy(old, patch + 1, plen); |
1871 | add_line_info(&preimage, old, plen, | |
c330fdd4 | 1872 | (first == ' ' ? LINE_COMMON : 0)); |
61e08cca | 1873 | old += plen; |
e5a94313 | 1874 | if (first == '-') |
3cca928d LT |
1875 | break; |
1876 | /* Fall-through for ' ' */ | |
1877 | case '+': | |
8441a9a8 JH |
1878 | /* --no-add does not add new lines */ |
1879 | if (first == '+' && no_add) | |
1880 | break; | |
1881 | ||
1882 | if (first != '+' || | |
1883 | !whitespace_error || | |
1884 | ws_error_action != correct_ws_error) { | |
1885 | memcpy(new, patch + 1, plen); | |
1886 | added = plen; | |
1887 | } | |
1888 | else { | |
fe3403c3 | 1889 | added = ws_fix_copy(new, patch + 1, plen, ws_rule, &applied_after_fixing_ws); |
077e1af5 | 1890 | } |
8441a9a8 JH |
1891 | add_line_info(&postimage, new, added, |
1892 | (first == '+' ? 0 : LINE_COMMON)); | |
1893 | new += added; | |
1894 | if (first == '+' && | |
1895 | added == 1 && new[-1] == '\n') | |
1896 | added_blank_line = 1; | |
3cca928d LT |
1897 | break; |
1898 | case '@': case '\\': | |
1899 | /* Ignore it, we already handled it */ | |
1900 | break; | |
1901 | default: | |
aeabfa07 JS |
1902 | if (apply_verbosely) |
1903 | error("invalid start of line: '%c'", first); | |
3cca928d LT |
1904 | return -1; |
1905 | } | |
077e1af5 JH |
1906 | if (added_blank_line) |
1907 | new_blank_lines_at_end++; | |
1908 | else | |
1909 | new_blank_lines_at_end = 0; | |
3cca928d LT |
1910 | patch += len; |
1911 | size -= len; | |
1912 | } | |
81bf96bb | 1913 | if (inaccurate_eof && |
61e08cca JH |
1914 | old > oldlines && old[-1] == '\n' && |
1915 | new > newlines && new[-1] == '\n') { | |
1916 | old--; | |
1917 | new--; | |
5b5d4d9e | 1918 | } |
47495887 | 1919 | |
47495887 EB |
1920 | leading = frag->leading; |
1921 | trailing = frag->trailing; | |
1bf1a859 LT |
1922 | |
1923 | /* | |
ee5a317e JH |
1924 | * A hunk to change lines at the beginning would begin with |
1925 | * @@ -1,L +N,M @@ | |
4be60962 | 1926 | * |
ee5a317e JH |
1927 | * And a hunk to add to an empty file would begin with |
1928 | * @@ -0,0 +N,M @@ | |
1929 | * | |
1930 | * In other words, a hunk that is (frag->oldpos <= 1) with or | |
1931 | * without leading context must match at the beginning. | |
1bf1a859 | 1932 | */ |
ee5a317e JH |
1933 | match_beginning = frag->oldpos <= 1; |
1934 | ||
1935 | /* | |
1936 | * A hunk without trailing lines must match at the end. | |
1937 | * However, we simply cannot tell if a hunk must match end | |
1938 | * from the lack of trailing lines if the patch was generated | |
1939 | * with unidiff without any context. | |
1940 | */ | |
1941 | match_end = !unidiff_zero && !trailing; | |
1bf1a859 | 1942 | |
b94f2eda | 1943 | pos = frag->newpos ? (frag->newpos - 1) : 0; |
61e08cca JH |
1944 | preimage.buf = oldlines; |
1945 | preimage.len = old - oldlines; | |
1946 | postimage.buf = newlines; | |
1947 | postimage.len = new - newlines; | |
c330fdd4 JH |
1948 | preimage.line = preimage.line_allocated; |
1949 | postimage.line = postimage.line_allocated; | |
1950 | ||
47495887 | 1951 | for (;;) { |
efe7f358 | 1952 | |
c607aaa2 JH |
1953 | applied_pos = find_pos(img, &preimage, &postimage, pos, |
1954 | ws_rule, match_beginning, match_end); | |
b94f2eda JH |
1955 | |
1956 | if (applied_pos >= 0) | |
47495887 | 1957 | break; |
47495887 EB |
1958 | |
1959 | /* Am I at my context limits? */ | |
1960 | if ((leading <= p_context) && (trailing <= p_context)) | |
1961 | break; | |
65aadb92 JH |
1962 | if (match_beginning || match_end) { |
1963 | match_beginning = match_end = 0; | |
1bf1a859 LT |
1964 | continue; |
1965 | } | |
b94f2eda | 1966 | |
81bf96bb JH |
1967 | /* |
1968 | * Reduce the number of context lines; reduce both | |
1969 | * leading and trailing if they are equal otherwise | |
1970 | * just reduce the larger context. | |
47495887 EB |
1971 | */ |
1972 | if (leading >= trailing) { | |
b94f2eda JH |
1973 | remove_first_line(&preimage); |
1974 | remove_first_line(&postimage); | |
47495887 EB |
1975 | pos--; |
1976 | leading--; | |
1977 | } | |
1978 | if (trailing > leading) { | |
b94f2eda JH |
1979 | remove_last_line(&preimage); |
1980 | remove_last_line(&postimage); | |
47495887 | 1981 | trailing--; |
6e7c92a9 | 1982 | } |
3cca928d LT |
1983 | } |
1984 | ||
b94f2eda JH |
1985 | if (applied_pos >= 0) { |
1986 | if (ws_error_action == correct_ws_error && | |
1987 | new_blank_lines_at_end && | |
1988 | postimage.nr + applied_pos == img->nr) { | |
1989 | /* | |
1990 | * If the patch application adds blank lines | |
1991 | * at the end, and if the patch applies at the | |
1992 | * end of the image, remove those added blank | |
1993 | * lines. | |
1994 | */ | |
1995 | while (new_blank_lines_at_end--) | |
1996 | remove_last_line(&postimage); | |
1997 | } | |
aeabfa07 | 1998 | |
b94f2eda JH |
1999 | /* |
2000 | * Warn if it was necessary to reduce the number | |
2001 | * of context lines. | |
2002 | */ | |
2003 | if ((leading != frag->leading) || | |
2004 | (trailing != frag->trailing)) | |
2005 | fprintf(stderr, "Context reduced to (%ld/%ld)" | |
2006 | " to apply fragment at %d\n", | |
2007 | leading, trailing, applied_pos+1); | |
2008 | update_image(img, applied_pos, &preimage, &postimage); | |
2009 | } else { | |
2010 | if (apply_verbosely) | |
61e08cca JH |
2011 | error("while searching for:\n%.*s", |
2012 | (int)(old - oldlines), oldlines); | |
b94f2eda | 2013 | } |
aeabfa07 | 2014 | |
61e08cca JH |
2015 | free(oldlines); |
2016 | free(newlines); | |
b94f2eda JH |
2017 | free(preimage.line_allocated); |
2018 | free(postimage.line_allocated); | |
2019 | ||
2020 | return (applied_pos < 0); | |
3cca928d LT |
2021 | } |
2022 | ||
b94f2eda | 2023 | static int apply_binary_fragment(struct image *img, struct patch *patch) |
0660626c | 2024 | { |
0660626c | 2025 | struct fragment *fragment = patch->fragments; |
c7f9cb14 PH |
2026 | unsigned long len; |
2027 | void *dst; | |
0660626c | 2028 | |
3cd4f5e8 JH |
2029 | /* Binary patch is irreversible without the optional second hunk */ |
2030 | if (apply_in_reverse) { | |
2031 | if (!fragment->next) | |
2032 | return error("cannot reverse-apply a binary patch " | |
2033 | "without the reverse hunk to '%s'", | |
2034 | patch->new_name | |
2035 | ? patch->new_name : patch->old_name); | |
03eb8f8a | 2036 | fragment = fragment->next; |
3cd4f5e8 | 2037 | } |
3cd4f5e8 | 2038 | switch (fragment->binary_patch_method) { |
0660626c | 2039 | case BINARY_DELTA_DEFLATED: |
b94f2eda | 2040 | dst = patch_delta(img->buf, img->len, fragment->patch, |
c7f9cb14 PH |
2041 | fragment->size, &len); |
2042 | if (!dst) | |
2043 | return -1; | |
b94f2eda JH |
2044 | clear_image(img); |
2045 | img->buf = dst; | |
2046 | img->len = len; | |
c7f9cb14 | 2047 | return 0; |
0660626c | 2048 | case BINARY_LITERAL_DEFLATED: |
b94f2eda JH |
2049 | clear_image(img); |
2050 | img->len = fragment->size; | |
2051 | img->buf = xmalloc(img->len+1); | |
2052 | memcpy(img->buf, fragment->patch, img->len); | |
2053 | img->buf[img->len] = '\0'; | |
c7f9cb14 | 2054 | return 0; |
0660626c | 2055 | } |
c7f9cb14 | 2056 | return -1; |
0660626c JH |
2057 | } |
2058 | ||
b94f2eda | 2059 | static int apply_binary(struct image *img, struct patch *patch) |
3cca928d | 2060 | { |
011f4274 | 2061 | const char *name = patch->old_name ? patch->old_name : patch->new_name; |
051308f6 | 2062 | unsigned char sha1[20]; |
011f4274 | 2063 | |
81bf96bb JH |
2064 | /* |
2065 | * For safety, we require patch index line to contain | |
051308f6 JH |
2066 | * full 40-byte textual SHA1 for old and new, at least for now. |
2067 | */ | |
2068 | if (strlen(patch->old_sha1_prefix) != 40 || | |
2069 | strlen(patch->new_sha1_prefix) != 40 || | |
2070 | get_sha1_hex(patch->old_sha1_prefix, sha1) || | |
2071 | get_sha1_hex(patch->new_sha1_prefix, sha1)) | |
2072 | return error("cannot apply binary patch to '%s' " | |
2073 | "without full index line", name); | |
011f4274 | 2074 | |
051308f6 | 2075 | if (patch->old_name) { |
81bf96bb JH |
2076 | /* |
2077 | * See if the old one matches what the patch | |
051308f6 | 2078 | * applies to. |
011f4274 | 2079 | */ |
b94f2eda | 2080 | hash_sha1_file(img->buf, img->len, blob_type, sha1); |
051308f6 JH |
2081 | if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix)) |
2082 | return error("the patch applies to '%s' (%s), " | |
2083 | "which does not match the " | |
2084 | "current contents.", | |
2085 | name, sha1_to_hex(sha1)); | |
2086 | } | |
2087 | else { | |
2088 | /* Otherwise, the old one must be empty. */ | |
b94f2eda | 2089 | if (img->len) |
051308f6 JH |
2090 | return error("the patch applies to an empty " |
2091 | "'%s' but it is not empty", name); | |
2092 | } | |
011f4274 | 2093 | |
0660626c | 2094 | get_sha1_hex(patch->new_sha1_prefix, sha1); |
0bef57ee | 2095 | if (is_null_sha1(sha1)) { |
b94f2eda | 2096 | clear_image(img); |
051308f6 | 2097 | return 0; /* deletion patch */ |
0660626c | 2098 | } |
011f4274 | 2099 | |
051308f6 | 2100 | if (has_sha1_file(sha1)) { |
0660626c | 2101 | /* We already have the postimage */ |
21666f1a | 2102 | enum object_type type; |
051308f6 | 2103 | unsigned long size; |
c7f9cb14 | 2104 | char *result; |
051308f6 | 2105 | |
c7f9cb14 PH |
2106 | result = read_sha1_file(sha1, &type, &size); |
2107 | if (!result) | |
051308f6 JH |
2108 | return error("the necessary postimage %s for " |
2109 | "'%s' cannot be read", | |
2110 | patch->new_sha1_prefix, name); | |
b94f2eda JH |
2111 | clear_image(img); |
2112 | img->buf = result; | |
2113 | img->len = size; | |
c7f9cb14 | 2114 | } else { |
81bf96bb JH |
2115 | /* |
2116 | * We have verified buf matches the preimage; | |
0660626c JH |
2117 | * apply the patch data to it, which is stored |
2118 | * in the patch->fragments->{patch,size}. | |
011f4274 | 2119 | */ |
b94f2eda | 2120 | if (apply_binary_fragment(img, patch)) |
051308f6 JH |
2121 | return error("binary patch does not apply to '%s'", |
2122 | name); | |
011f4274 | 2123 | |
051308f6 | 2124 | /* verify that the result matches */ |
b94f2eda | 2125 | hash_sha1_file(img->buf, img->len, blob_type, sha1); |
051308f6 | 2126 | if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix)) |
c7f9cb14 PH |
2127 | return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)", |
2128 | name, patch->new_sha1_prefix, sha1_to_hex(sha1)); | |
011f4274 | 2129 | } |
3cca928d | 2130 | |
051308f6 JH |
2131 | return 0; |
2132 | } | |
2133 | ||
b94f2eda | 2134 | static int apply_fragments(struct image *img, struct patch *patch) |
051308f6 JH |
2135 | { |
2136 | struct fragment *frag = patch->fragments; | |
2137 | const char *name = patch->old_name ? patch->old_name : patch->new_name; | |
cf1b7869 JH |
2138 | unsigned ws_rule = patch->ws_rule; |
2139 | unsigned inaccurate_eof = patch->inaccurate_eof; | |
051308f6 JH |
2140 | |
2141 | if (patch->is_binary) | |
b94f2eda | 2142 | return apply_binary(img, patch); |
051308f6 | 2143 | |
3cca928d | 2144 | while (frag) { |
b94f2eda | 2145 | if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule)) { |
57dc397c JH |
2146 | error("patch failed: %s:%ld", name, frag->oldpos); |
2147 | if (!apply_with_reject) | |
2148 | return -1; | |
2149 | frag->rejected = 1; | |
2150 | } | |
3cca928d LT |
2151 | frag = frag->next; |
2152 | } | |
30996652 | 2153 | return 0; |
3cca928d LT |
2154 | } |
2155 | ||
c7f9cb14 | 2156 | static int read_file_or_gitlink(struct cache_entry *ce, struct strbuf *buf) |
e06c5a6c SV |
2157 | { |
2158 | if (!ce) | |
2159 | return 0; | |
2160 | ||
7a51ed66 | 2161 | if (S_ISGITLINK(ce->ce_mode)) { |
c7f9cb14 PH |
2162 | strbuf_grow(buf, 100); |
2163 | strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(ce->sha1)); | |
e06c5a6c SV |
2164 | } else { |
2165 | enum object_type type; | |
c7f9cb14 PH |
2166 | unsigned long sz; |
2167 | char *result; | |
2168 | ||
2169 | result = read_sha1_file(ce->sha1, &type, &sz); | |
2170 | if (!result) | |
e06c5a6c | 2171 | return -1; |
c7f9cb14 PH |
2172 | /* XXX read_sha1_file NUL-terminates */ |
2173 | strbuf_attach(buf, result, sz, sz + 1); | |
e06c5a6c SV |
2174 | } |
2175 | return 0; | |
2176 | } | |
2177 | ||
04e4888e | 2178 | static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce) |
3cca928d | 2179 | { |
c7f9cb14 | 2180 | struct strbuf buf; |
b94f2eda JH |
2181 | struct image image; |
2182 | size_t len; | |
2183 | char *img; | |
3cca928d | 2184 | |
c7f9cb14 | 2185 | strbuf_init(&buf, 0); |
04e4888e | 2186 | if (cached) { |
c7f9cb14 | 2187 | if (read_file_or_gitlink(ce, &buf)) |
e06c5a6c | 2188 | return error("read of %s failed", patch->old_name); |
e06c5a6c SV |
2189 | } else if (patch->old_name) { |
2190 | if (S_ISGITLINK(patch->old_mode)) { | |
c7f9cb14 PH |
2191 | if (ce) { |
2192 | read_file_or_gitlink(ce, &buf); | |
2193 | } else { | |
e06c5a6c SV |
2194 | /* |
2195 | * There is no way to apply subproject | |
2196 | * patch without looking at the index. | |
2197 | */ | |
2198 | patch->fragments = NULL; | |
e06c5a6c | 2199 | } |
c7f9cb14 PH |
2200 | } else { |
2201 | if (read_old_data(st, patch->old_name, &buf)) | |
2202 | return error("read of %s failed", patch->old_name); | |
04e4888e JH |
2203 | } |
2204 | } | |
6e7c92a9 | 2205 | |
b94f2eda JH |
2206 | img = strbuf_detach(&buf, &len); |
2207 | prepare_image(&image, img, len, !patch->is_binary); | |
2208 | ||
2209 | if (apply_fragments(&image, patch) < 0) | |
57dc397c | 2210 | return -1; /* note with --reject this succeeds. */ |
b94f2eda JH |
2211 | patch->result = image.buf; |
2212 | patch->resultsize = image.len; | |
2213 | free(image.line_allocated); | |
5aa7d94c | 2214 | |
4be60962 | 2215 | if (0 < patch->is_delete && patch->resultsize) |
5aa7d94c LT |
2216 | return error("removal patch leaves file contents"); |
2217 | ||
3cca928d LT |
2218 | return 0; |
2219 | } | |
2220 | ||
64cab591 JH |
2221 | static int check_to_create_blob(const char *new_name, int ok_if_exists) |
2222 | { | |
2223 | struct stat nst; | |
2224 | if (!lstat(new_name, &nst)) { | |
2225 | if (S_ISDIR(nst.st_mode) || ok_if_exists) | |
2226 | return 0; | |
2227 | /* | |
2228 | * A leading component of new_name might be a symlink | |
2229 | * that is going to be removed with this patch, but | |
2230 | * still pointing at somewhere that has the path. | |
2231 | * In such a case, path "new_name" does not exist as | |
2232 | * far as git is concerned. | |
2233 | */ | |
c40641b7 | 2234 | if (has_symlink_leading_path(strlen(new_name), new_name)) |
64cab591 JH |
2235 | return 0; |
2236 | ||
2237 | return error("%s: already exists in working directory", new_name); | |
2238 | } | |
2239 | else if ((errno != ENOENT) && (errno != ENOTDIR)) | |
2240 | return error("%s: %s", new_name, strerror(errno)); | |
2241 | return 0; | |
2242 | } | |
2243 | ||
e06c5a6c SV |
2244 | static int verify_index_match(struct cache_entry *ce, struct stat *st) |
2245 | { | |
7a51ed66 | 2246 | if (S_ISGITLINK(ce->ce_mode)) { |
e06c5a6c SV |
2247 | if (!S_ISDIR(st->st_mode)) |
2248 | return -1; | |
2249 | return 0; | |
2250 | } | |
4bd5b7da | 2251 | return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID); |
e06c5a6c SV |
2252 | } |
2253 | ||
5c47f4c6 | 2254 | static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st) |
fab2c257 LT |
2255 | { |
2256 | const char *old_name = patch->old_name; | |
5c47f4c6 JH |
2257 | int stat_ret = 0; |
2258 | unsigned st_mode = 0; | |
e06c5a6c SV |
2259 | |
2260 | /* | |
2261 | * Make sure that we do not have local modifications from the | |
2262 | * index when we are looking at the index. Also make sure | |
2263 | * we have the preimage file to be patched in the work tree, | |
2264 | * unless --cached, which tells git to apply only in the index. | |
2265 | */ | |
5c47f4c6 JH |
2266 | if (!old_name) |
2267 | return 0; | |
04e4888e | 2268 | |
5c47f4c6 JH |
2269 | assert(patch->is_new <= 0); |
2270 | if (!cached) { | |
2271 | stat_ret = lstat(old_name, st); | |
2272 | if (stat_ret && errno != ENOENT) | |
2273 | return error("%s: %s", old_name, strerror(errno)); | |
2274 | } | |
2275 | if (check_index) { | |
2276 | int pos = cache_name_pos(old_name, strlen(old_name)); | |
2277 | if (pos < 0) { | |
2278 | if (patch->is_new < 0) | |
2279 | goto is_new; | |
2280 | return error("%s: does not exist in index", old_name); | |
2281 | } | |
2282 | *ce = active_cache[pos]; | |
2283 | if (stat_ret < 0) { | |
2284 | struct checkout costate; | |
2285 | /* checkout */ | |
2286 | costate.base_dir = ""; | |
2287 | costate.base_dir_len = 0; | |
2288 | costate.force = 0; | |
2289 | costate.quiet = 0; | |
2290 | costate.not_new = 0; | |
2291 | costate.refresh_cache = 1; | |
2292 | if (checkout_entry(*ce, &costate, NULL) || | |
2293 | lstat(old_name, st)) | |
2294 | return -1; | |
2295 | } | |
2296 | if (!cached && verify_index_match(*ce, st)) | |
2297 | return error("%s: does not match index", old_name); | |
2298 | if (cached) | |
2299 | st_mode = (*ce)->ce_mode; | |
2300 | } else if (stat_ret < 0) { | |
3cca928d | 2301 | if (patch->is_new < 0) |
5c47f4c6 JH |
2302 | goto is_new; |
2303 | return error("%s: %s", old_name, strerror(errno)); | |
fab2c257 | 2304 | } |
a577284a | 2305 | |
5c47f4c6 JH |
2306 | if (!cached) |
2307 | st_mode = ce_mode_from_stat(*ce, st->st_mode); | |
2308 | ||
2309 | if (patch->is_new < 0) | |
2310 | patch->is_new = 0; | |
2311 | if (!patch->old_mode) | |
2312 | patch->old_mode = st_mode; | |
2313 | if ((st_mode ^ patch->old_mode) & S_IFMT) | |
2314 | return error("%s: wrong type", old_name); | |
2315 | if (st_mode != patch->old_mode) | |
2316 | fprintf(stderr, "warning: %s has type %o, expected %o\n", | |
2317 | old_name, st_mode, patch->old_mode); | |
2318 | return 0; | |
2319 | ||
2320 | is_new: | |
2321 | patch->is_new = 1; | |
2322 | patch->is_delete = 0; | |
2323 | patch->old_name = NULL; | |
2324 | return 0; | |
2325 | } | |
2326 | ||
2327 | static int check_patch(struct patch *patch, struct patch *prev_patch) | |
2328 | { | |
2329 | struct stat st; | |
2330 | const char *old_name = patch->old_name; | |
2331 | const char *new_name = patch->new_name; | |
2332 | const char *name = old_name ? old_name : new_name; | |
2333 | struct cache_entry *ce = NULL; | |
2334 | int ok_if_exists; | |
2335 | int status; | |
2336 | ||
2337 | patch->rejected = 1; /* we will drop this after we succeed */ | |
2338 | ||
2339 | status = check_preimage(patch, &ce, &st); | |
2340 | if (status) | |
2341 | return status; | |
2342 | old_name = patch->old_name; | |
2343 | ||
4be60962 | 2344 | if (new_name && prev_patch && 0 < prev_patch->is_delete && |
7f95aef2 | 2345 | !strcmp(prev_patch->old_name, new_name)) |
81bf96bb JH |
2346 | /* |
2347 | * A type-change diff is always split into a patch to | |
7f95aef2 JH |
2348 | * delete old, immediately followed by a patch to |
2349 | * create new (see diff.c::run_diff()); in such a case | |
2350 | * it is Ok that the entry to be deleted by the | |
2351 | * previous patch is still in the working tree and in | |
2352 | * the index. | |
2353 | */ | |
2354 | ok_if_exists = 1; | |
2355 | else | |
2356 | ok_if_exists = 0; | |
2357 | ||
4be60962 JH |
2358 | if (new_name && |
2359 | ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) { | |
7f95aef2 JH |
2360 | if (check_index && |
2361 | cache_name_pos(new_name, strlen(new_name)) >= 0 && | |
2362 | !ok_if_exists) | |
a577284a | 2363 | return error("%s: already exists in index", new_name); |
d91d4c2c | 2364 | if (!cached) { |
64cab591 JH |
2365 | int err = check_to_create_blob(new_name, ok_if_exists); |
2366 | if (err) | |
2367 | return err; | |
d91d4c2c | 2368 | } |
35cc4bcd | 2369 | if (!patch->new_mode) { |
4be60962 | 2370 | if (0 < patch->is_new) |
35cc4bcd JS |
2371 | patch->new_mode = S_IFREG | 0644; |
2372 | else | |
2373 | patch->new_mode = patch->old_mode; | |
2374 | } | |
fab2c257 | 2375 | } |
3cca928d LT |
2376 | |
2377 | if (new_name && old_name) { | |
2378 | int same = !strcmp(old_name, new_name); | |
2379 | if (!patch->new_mode) | |
2380 | patch->new_mode = patch->old_mode; | |
2381 | if ((patch->old_mode ^ patch->new_mode) & S_IFMT) | |
2382 | return error("new mode (%o) of %s does not match old mode (%o)%s%s", | |
2383 | patch->new_mode, new_name, patch->old_mode, | |
2384 | same ? "" : " of ", same ? "" : old_name); | |
04e4888e | 2385 | } |
3cca928d | 2386 | |
04e4888e | 2387 | if (apply_data(patch, &st, ce) < 0) |
011f4274 | 2388 | return error("%s: patch does not apply", name); |
57dc397c | 2389 | patch->rejected = 0; |
a577284a | 2390 | return 0; |
fab2c257 LT |
2391 | } |
2392 | ||
a577284a | 2393 | static int check_patch_list(struct patch *patch) |
19c58fb8 | 2394 | { |
7f95aef2 | 2395 | struct patch *prev_patch = NULL; |
60b7f38e | 2396 | int err = 0; |
a577284a | 2397 | |
7f95aef2 | 2398 | for (prev_patch = NULL; patch ; patch = patch->next) { |
a2bf404e JH |
2399 | if (apply_verbosely) |
2400 | say_patch_name(stderr, | |
2401 | "Checking patch ", patch, "...\n"); | |
60b7f38e | 2402 | err |= check_patch(patch, prev_patch); |
7f95aef2 JH |
2403 | prev_patch = patch; |
2404 | } | |
60b7f38e | 2405 | return err; |
a577284a LT |
2406 | } |
2407 | ||
ece7b749 JS |
2408 | /* This function tries to read the sha1 from the current index */ |
2409 | static int get_current_sha1(const char *path, unsigned char *sha1) | |
2410 | { | |
2411 | int pos; | |
2412 | ||
2413 | if (read_cache() < 0) | |
2414 | return -1; | |
2415 | pos = cache_name_pos(path, strlen(path)); | |
2416 | if (pos < 0) | |
2417 | return -1; | |
2418 | hashcpy(sha1, active_cache[pos]->sha1); | |
2419 | return 0; | |
2420 | } | |
2421 | ||
7a988699 JS |
2422 | /* Build an index that contains the just the files needed for a 3way merge */ |
2423 | static void build_fake_ancestor(struct patch *list, const char *filename) | |
2cf67f1e JH |
2424 | { |
2425 | struct patch *patch; | |
7a988699 JS |
2426 | struct index_state result = { 0 }; |
2427 | int fd; | |
2cf67f1e JH |
2428 | |
2429 | /* Once we start supporting the reverse patch, it may be | |
2430 | * worth showing the new sha1 prefix, but until then... | |
2431 | */ | |
2432 | for (patch = list; patch; patch = patch->next) { | |
2433 | const unsigned char *sha1_ptr; | |
2434 | unsigned char sha1[20]; | |
7a988699 | 2435 | struct cache_entry *ce; |
2cf67f1e JH |
2436 | const char *name; |
2437 | ||
2438 | name = patch->old_name ? patch->old_name : patch->new_name; | |
4be60962 | 2439 | if (0 < patch->is_new) |
7a988699 | 2440 | continue; |
2cf67f1e | 2441 | else if (get_sha1(patch->old_sha1_prefix, sha1)) |
ece7b749 JS |
2442 | /* git diff has no index line for mode/type changes */ |
2443 | if (!patch->lines_added && !patch->lines_deleted) { | |
2444 | if (get_current_sha1(patch->new_name, sha1) || | |
2445 | get_current_sha1(patch->old_name, sha1)) | |
2446 | die("mode change for %s, which is not " | |
2447 | "in current HEAD", name); | |
2448 | sha1_ptr = sha1; | |
2449 | } else | |
2450 | die("sha1 information is lacking or useless " | |
2451 | "(%s).", name); | |
2cf67f1e JH |
2452 | else |
2453 | sha1_ptr = sha1; | |
22943f1a | 2454 | |
7a988699 JS |
2455 | ce = make_cache_entry(patch->old_mode, sha1_ptr, name, 0, 0); |
2456 | if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD)) | |
2457 | die ("Could not add %s to temporary index", name); | |
2cf67f1e | 2458 | } |
7a988699 JS |
2459 | |
2460 | fd = open(filename, O_WRONLY | O_CREAT, 0666); | |
2461 | if (fd < 0 || write_index(&result, fd) || close(fd)) | |
2462 | die ("Could not write temporary index to %s", filename); | |
2463 | ||
2464 | discard_index(&result); | |
2cf67f1e JH |
2465 | } |
2466 | ||
a577284a LT |
2467 | static void stat_patch_list(struct patch *patch) |
2468 | { | |
2469 | int files, adds, dels; | |
2470 | ||
2471 | for (files = adds = dels = 0 ; patch ; patch = patch->next) { | |
2472 | files++; | |
2473 | adds += patch->lines_added; | |
2474 | dels += patch->lines_deleted; | |
2475 | show_stats(patch); | |
2476 | } | |
2477 | ||
2478 | printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels); | |
3f40315a LT |
2479 | } |
2480 | ||
7d8b7c21 JH |
2481 | static void numstat_patch_list(struct patch *patch) |
2482 | { | |
2483 | for ( ; patch; patch = patch->next) { | |
2484 | const char *name; | |
49e3343c | 2485 | name = patch->new_name ? patch->new_name : patch->old_name; |
ef58d958 JH |
2486 | if (patch->is_binary) |
2487 | printf("-\t-\t"); | |
2488 | else | |
663af342 PH |
2489 | printf("%d\t%d\t", patch->lines_added, patch->lines_deleted); |
2490 | write_name_quoted(name, stdout, line_termination); | |
7d8b7c21 JH |
2491 | } |
2492 | } | |
2493 | ||
96c912a4 JH |
2494 | static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name) |
2495 | { | |
2496 | if (mode) | |
2497 | printf(" %s mode %06o %s\n", newdelete, mode, name); | |
2498 | else | |
2499 | printf(" %s %s\n", newdelete, name); | |
2500 | } | |
2501 | ||
2502 | static void show_mode_change(struct patch *p, int show_name) | |
2503 | { | |
2504 | if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) { | |
2505 | if (show_name) | |
2506 | printf(" mode change %06o => %06o %s\n", | |
2507 | p->old_mode, p->new_mode, p->new_name); | |
2508 | else | |
2509 | printf(" mode change %06o => %06o\n", | |
2510 | p->old_mode, p->new_mode); | |
2511 | } | |
2512 | } | |
2513 | ||
2514 | static void show_rename_copy(struct patch *p) | |
2515 | { | |
2516 | const char *renamecopy = p->is_rename ? "rename" : "copy"; | |
2517 | const char *old, *new; | |
2518 | ||
2519 | /* Find common prefix */ | |
2520 | old = p->old_name; | |
2521 | new = p->new_name; | |
2522 | while (1) { | |
2523 | const char *slash_old, *slash_new; | |
2524 | slash_old = strchr(old, '/'); | |
2525 | slash_new = strchr(new, '/'); | |
2526 | if (!slash_old || | |
2527 | !slash_new || | |
2528 | slash_old - old != slash_new - new || | |
2529 | memcmp(old, new, slash_new - new)) | |
2530 | break; | |
2531 | old = slash_old + 1; | |
2532 | new = slash_new + 1; | |
2533 | } | |
2534 | /* p->old_name thru old is the common prefix, and old and new | |
2535 | * through the end of names are renames | |
2536 | */ | |
2537 | if (old != p->old_name) | |
2538 | printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy, | |
e30e814d | 2539 | (int)(old - p->old_name), p->old_name, |
96c912a4 JH |
2540 | old, new, p->score); |
2541 | else | |
2542 | printf(" %s %s => %s (%d%%)\n", renamecopy, | |
2543 | p->old_name, p->new_name, p->score); | |
2544 | show_mode_change(p, 0); | |
2545 | } | |
2546 | ||
2547 | static void summary_patch_list(struct patch *patch) | |
2548 | { | |
2549 | struct patch *p; | |
2550 | ||
2551 | for (p = patch; p; p = p->next) { | |
2552 | if (p->is_new) | |
2553 | show_file_mode_name("create", p->new_mode, p->new_name); | |
2554 | else if (p->is_delete) | |
2555 | show_file_mode_name("delete", p->old_mode, p->old_name); | |
2556 | else { | |
2557 | if (p->is_rename || p->is_copy) | |
2558 | show_rename_copy(p); | |
2559 | else { | |
2560 | if (p->score) { | |
2561 | printf(" rewrite %s (%d%%)\n", | |
2562 | p->new_name, p->score); | |
2563 | show_mode_change(p, 0); | |
2564 | } | |
2565 | else | |
2566 | show_mode_change(p, 1); | |
2567 | } | |
2568 | } | |
2569 | } | |
2570 | } | |
2571 | ||
3f40315a LT |
2572 | static void patch_stats(struct patch *patch) |
2573 | { | |
2574 | int lines = patch->lines_added + patch->lines_deleted; | |
2575 | ||
2576 | if (lines > max_change) | |
2577 | max_change = lines; | |
2578 | if (patch->old_name) { | |
22943f1a JH |
2579 | int len = quote_c_style(patch->old_name, NULL, NULL, 0); |
2580 | if (!len) | |
2581 | len = strlen(patch->old_name); | |
3f40315a LT |
2582 | if (len > max_len) |
2583 | max_len = len; | |
2584 | } | |
2585 | if (patch->new_name) { | |
22943f1a JH |
2586 | int len = quote_c_style(patch->new_name, NULL, NULL, 0); |
2587 | if (!len) | |
2588 | len = strlen(patch->new_name); | |
3f40315a LT |
2589 | if (len > max_len) |
2590 | max_len = len; | |
2591 | } | |
19c58fb8 LT |
2592 | } |
2593 | ||
aea19457 | 2594 | static void remove_file(struct patch *patch, int rmdir_empty) |
5aa7d94c | 2595 | { |
7da3bf37 | 2596 | if (update_index) { |
5aa7d94c LT |
2597 | if (remove_file_from_cache(patch->old_name) < 0) |
2598 | die("unable to remove %s from index", patch->old_name); | |
2599 | } | |
d234b21c | 2600 | if (!cached) { |
e06c5a6c SV |
2601 | if (S_ISGITLINK(patch->old_mode)) { |
2602 | if (rmdir(patch->old_name)) | |
2603 | warning("unable to remove submodule %s", | |
2604 | patch->old_name); | |
2605 | } else if (!unlink(patch->old_name) && rmdir_empty) { | |
d234b21c AJ |
2606 | char *name = xstrdup(patch->old_name); |
2607 | char *end = strrchr(name, '/'); | |
2608 | while (end) { | |
2609 | *end = 0; | |
2610 | if (rmdir(name)) | |
2611 | break; | |
2612 | end = strrchr(name, '/'); | |
2613 | } | |
2614 | free(name); | |
2615 | } | |
2616 | } | |
5aa7d94c LT |
2617 | } |
2618 | ||
2619 | static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size) | |
2620 | { | |
2621 | struct stat st; | |
2622 | struct cache_entry *ce; | |
2623 | int namelen = strlen(path); | |
2624 | unsigned ce_size = cache_entry_size(namelen); | |
2625 | ||
7da3bf37 | 2626 | if (!update_index) |
5aa7d94c LT |
2627 | return; |
2628 | ||
90321c10 | 2629 | ce = xcalloc(1, ce_size); |
5aa7d94c LT |
2630 | memcpy(ce->name, path, namelen); |
2631 | ce->ce_mode = create_ce_mode(mode); | |
7a51ed66 | 2632 | ce->ce_flags = namelen; |
e06c5a6c SV |
2633 | if (S_ISGITLINK(mode)) { |
2634 | const char *s = buf; | |
2635 | ||
2636 | if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1)) | |
2637 | die("corrupt patch for subproject %s", path); | |
2638 | } else { | |
2639 | if (!cached) { | |
2640 | if (lstat(path, &st) < 0) | |
2641 | die("unable to stat newly created file %s", | |
2642 | path); | |
2643 | fill_stat_cache_info(ce, &st); | |
2644 | } | |
2645 | if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0) | |
2646 | die("unable to create backing store for newly created file %s", path); | |
04e4888e | 2647 | } |
5aa7d94c LT |
2648 | if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0) |
2649 | die("unable to add cache entry for %s", path); | |
2650 | } | |
2651 | ||
1b668341 LT |
2652 | static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size) |
2653 | { | |
ac78e548 | 2654 | int fd; |
5ecd293d | 2655 | struct strbuf nbuf; |
1b668341 | 2656 | |
e06c5a6c SV |
2657 | if (S_ISGITLINK(mode)) { |
2658 | struct stat st; | |
2659 | if (!lstat(path, &st) && S_ISDIR(st.st_mode)) | |
2660 | return 0; | |
2661 | return mkdir(path, 0777); | |
2662 | } | |
2663 | ||
78a8d641 | 2664 | if (has_symlinks && S_ISLNK(mode)) |
2c71810b JH |
2665 | /* Although buf:size is counted string, it also is NUL |
2666 | * terminated. | |
2667 | */ | |
1b668341 | 2668 | return symlink(buf, path); |
cc96fd09 JH |
2669 | |
2670 | fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666); | |
2671 | if (fd < 0) | |
2672 | return -1; | |
2673 | ||
5ecd293d PH |
2674 | strbuf_init(&nbuf, 0); |
2675 | if (convert_to_working_tree(path, buf, size, &nbuf)) { | |
2676 | size = nbuf.len; | |
2677 | buf = nbuf.buf; | |
1b668341 | 2678 | } |
c7f9cb14 PH |
2679 | write_or_die(fd, buf, size); |
2680 | strbuf_release(&nbuf); | |
ac78e548 | 2681 | |
1b668341 LT |
2682 | if (close(fd) < 0) |
2683 | die("closing file %s: %s", path, strerror(errno)); | |
2684 | return 0; | |
2685 | } | |
2686 | ||
5c8af185 LT |
2687 | /* |
2688 | * We optimistically assume that the directories exist, | |
2689 | * which is true 99% of the time anyway. If they don't, | |
2690 | * we create them and try again. | |
2691 | */ | |
8361e1d4 | 2692 | static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size) |
5c8af185 | 2693 | { |
04e4888e JH |
2694 | if (cached) |
2695 | return; | |
1b668341 LT |
2696 | if (!try_create_file(path, mode, buf, size)) |
2697 | return; | |
5c8af185 | 2698 | |
1b668341 | 2699 | if (errno == ENOENT) { |
8361e1d4 JR |
2700 | if (safe_create_leading_directories(path)) |
2701 | return; | |
1b668341 LT |
2702 | if (!try_create_file(path, mode, buf, size)) |
2703 | return; | |
5c8af185 | 2704 | } |
5c8af185 | 2705 | |
56ac168f | 2706 | if (errno == EEXIST || errno == EACCES) { |
c28c571c JH |
2707 | /* We may be trying to create a file where a directory |
2708 | * used to be. | |
2709 | */ | |
2710 | struct stat st; | |
0afa7644 | 2711 | if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path))) |
c28c571c JH |
2712 | errno = EEXIST; |
2713 | } | |
2714 | ||
1b668341 LT |
2715 | if (errno == EEXIST) { |
2716 | unsigned int nr = getpid(); | |
5c8af185 | 2717 | |
1b668341 LT |
2718 | for (;;) { |
2719 | const char *newpath; | |
2720 | newpath = mkpath("%s~%u", path, nr); | |
2721 | if (!try_create_file(newpath, mode, buf, size)) { | |
2722 | if (!rename(newpath, path)) | |
2723 | return; | |
2724 | unlink(newpath); | |
2725 | break; | |
2726 | } | |
2727 | if (errno != EEXIST) | |
2728 | break; | |
d9e08be9 AR |
2729 | ++nr; |
2730 | } | |
5c8af185 | 2731 | } |
1b668341 | 2732 | die("unable to write file %s mode %o", path, mode); |
5c8af185 LT |
2733 | } |
2734 | ||
5aa7d94c LT |
2735 | static void create_file(struct patch *patch) |
2736 | { | |
8361e1d4 | 2737 | char *path = patch->new_name; |
5aa7d94c LT |
2738 | unsigned mode = patch->new_mode; |
2739 | unsigned long size = patch->resultsize; | |
2740 | char *buf = patch->result; | |
2741 | ||
2742 | if (!mode) | |
2743 | mode = S_IFREG | 0644; | |
03ac6e64 | 2744 | create_one_file(path, mode, buf, size); |
1b668341 | 2745 | add_index_file(path, mode, buf, size); |
5aa7d94c LT |
2746 | } |
2747 | ||
eed46644 JH |
2748 | /* phase zero is to remove, phase one is to create */ |
2749 | static void write_out_one_result(struct patch *patch, int phase) | |
5aa7d94c LT |
2750 | { |
2751 | if (patch->is_delete > 0) { | |
eed46644 | 2752 | if (phase == 0) |
aea19457 | 2753 | remove_file(patch, 1); |
5aa7d94c LT |
2754 | return; |
2755 | } | |
2756 | if (patch->is_new > 0 || patch->is_copy) { | |
eed46644 JH |
2757 | if (phase == 1) |
2758 | create_file(patch); | |
5aa7d94c LT |
2759 | return; |
2760 | } | |
2761 | /* | |
2762 | * Rename or modification boils down to the same | |
2763 | * thing: remove the old, write the new | |
2764 | */ | |
eed46644 | 2765 | if (phase == 0) |
93969438 | 2766 | remove_file(patch, patch->is_rename); |
eed46644 | 2767 | if (phase == 1) |
57dc397c | 2768 | create_file(patch); |
5aa7d94c LT |
2769 | } |
2770 | ||
57dc397c JH |
2771 | static int write_out_one_reject(struct patch *patch) |
2772 | { | |
82e2765f JH |
2773 | FILE *rej; |
2774 | char namebuf[PATH_MAX]; | |
57dc397c | 2775 | struct fragment *frag; |
82e2765f | 2776 | int cnt = 0; |
57dc397c | 2777 | |
82e2765f | 2778 | for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) { |
57dc397c JH |
2779 | if (!frag->rejected) |
2780 | continue; | |
82e2765f JH |
2781 | cnt++; |
2782 | } | |
2783 | ||
a2bf404e JH |
2784 | if (!cnt) { |
2785 | if (apply_verbosely) | |
2786 | say_patch_name(stderr, | |
2787 | "Applied patch ", patch, " cleanly.\n"); | |
82e2765f | 2788 | return 0; |
a2bf404e | 2789 | } |
82e2765f JH |
2790 | |
2791 | /* This should not happen, because a removal patch that leaves | |
2792 | * contents are marked "rejected" at the patch level. | |
2793 | */ | |
2794 | if (!patch->new_name) | |
2795 | die("internal error"); | |
2796 | ||
a2bf404e JH |
2797 | /* Say this even without --verbose */ |
2798 | say_patch_name(stderr, "Applying patch ", patch, " with"); | |
2799 | fprintf(stderr, " %d rejects...\n", cnt); | |
2800 | ||
82e2765f JH |
2801 | cnt = strlen(patch->new_name); |
2802 | if (ARRAY_SIZE(namebuf) <= cnt + 5) { | |
2803 | cnt = ARRAY_SIZE(namebuf) - 5; | |
2804 | fprintf(stderr, | |
2805 | "warning: truncating .rej filename to %.*s.rej", | |
2806 | cnt - 1, patch->new_name); | |
2807 | } | |
2808 | memcpy(namebuf, patch->new_name, cnt); | |
2809 | memcpy(namebuf + cnt, ".rej", 5); | |
2810 | ||
2811 | rej = fopen(namebuf, "w"); | |
2812 | if (!rej) | |
2813 | return error("cannot open %s: %s", namebuf, strerror(errno)); | |
2814 | ||
2815 | /* Normal git tools never deal with .rej, so do not pretend | |
2816 | * this is a git patch by saying --git nor give extended | |
2817 | * headers. While at it, maybe please "kompare" that wants | |
2818 | * the trailing TAB and some garbage at the end of line ;-). | |
2819 | */ | |
2820 | fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n", | |
2821 | patch->new_name, patch->new_name); | |
0e9ee323 | 2822 | for (cnt = 1, frag = patch->fragments; |
82e2765f JH |
2823 | frag; |
2824 | cnt++, frag = frag->next) { | |
2825 | if (!frag->rejected) { | |
2826 | fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt); | |
2827 | continue; | |
57dc397c | 2828 | } |
82e2765f JH |
2829 | fprintf(stderr, "Rejected hunk #%d.\n", cnt); |
2830 | fprintf(rej, "%.*s", frag->size, frag->patch); | |
57dc397c | 2831 | if (frag->patch[frag->size-1] != '\n') |
82e2765f | 2832 | fputc('\n', rej); |
57dc397c | 2833 | } |
82e2765f JH |
2834 | fclose(rej); |
2835 | return -1; | |
5aa7d94c LT |
2836 | } |
2837 | ||
57dc397c | 2838 | static int write_out_results(struct patch *list, int skipped_patch) |
5aa7d94c | 2839 | { |
eed46644 | 2840 | int phase; |
57dc397c JH |
2841 | int errs = 0; |
2842 | struct patch *l; | |
eed46644 | 2843 | |
d854f783 | 2844 | if (!list && !skipped_patch) |
57dc397c | 2845 | return error("No changes"); |
f7b79707 | 2846 | |
eed46644 | 2847 | for (phase = 0; phase < 2; phase++) { |
57dc397c | 2848 | l = list; |
eed46644 | 2849 | while (l) { |
57dc397c JH |
2850 | if (l->rejected) |
2851 | errs = 1; | |
82e2765f | 2852 | else { |
57dc397c | 2853 | write_out_one_result(l, phase); |
82e2765f | 2854 | if (phase == 1 && write_out_one_reject(l)) |
57dc397c JH |
2855 | errs = 1; |
2856 | } | |
eed46644 JH |
2857 | l = l->next; |
2858 | } | |
5aa7d94c | 2859 | } |
57dc397c | 2860 | return errs; |
5aa7d94c LT |
2861 | } |
2862 | ||
021b6e45 | 2863 | static struct lock_file lock_file; |
5aa7d94c | 2864 | |
d854f783 JH |
2865 | static struct excludes { |
2866 | struct excludes *next; | |
2867 | const char *path; | |
2868 | } *excludes; | |
2869 | ||
2870 | static int use_patch(struct patch *p) | |
2871 | { | |
c7c81b3a | 2872 | const char *pathname = p->new_name ? p->new_name : p->old_name; |
d854f783 JH |
2873 | struct excludes *x = excludes; |
2874 | while (x) { | |
2875 | if (fnmatch(x->path, pathname, 0) == 0) | |
2876 | return 0; | |
2877 | x = x->next; | |
2878 | } | |
edf2e370 JH |
2879 | if (0 < prefix_length) { |
2880 | int pathlen = strlen(pathname); | |
2881 | if (pathlen <= prefix_length || | |
2882 | memcmp(prefix, pathname, prefix_length)) | |
2883 | return 0; | |
2884 | } | |
d854f783 JH |
2885 | return 1; |
2886 | } | |
2887 | ||
eac70c4f | 2888 | static void prefix_one(char **name) |
56185f49 | 2889 | { |
eac70c4f JS |
2890 | char *old_name = *name; |
2891 | if (!old_name) | |
2892 | return; | |
2893 | *name = xstrdup(prefix_filename(prefix, prefix_length, *name)); | |
2894 | free(old_name); | |
56185f49 JH |
2895 | } |
2896 | ||
2897 | static void prefix_patches(struct patch *p) | |
2898 | { | |
9987d7c5 | 2899 | if (!prefix || p->is_toplevel_relative) |
56185f49 JH |
2900 | return; |
2901 | for ( ; p; p = p->next) { | |
6c912f5b JH |
2902 | if (p->new_name == p->old_name) { |
2903 | char *prefixed = p->new_name; | |
2904 | prefix_one(&prefixed); | |
2905 | p->new_name = p->old_name = prefixed; | |
2906 | } | |
2907 | else { | |
eac70c4f | 2908 | prefix_one(&p->new_name); |
6c912f5b JH |
2909 | prefix_one(&p->old_name); |
2910 | } | |
56185f49 JH |
2911 | } |
2912 | } | |
2913 | ||
f686d030 | 2914 | static int apply_patch(int fd, const char *filename, int inaccurate_eof) |
c1bb9350 | 2915 | { |
9a76adeb PH |
2916 | size_t offset; |
2917 | struct strbuf buf; | |
19c58fb8 | 2918 | struct patch *list = NULL, **listp = &list; |
d854f783 | 2919 | int skipped_patch = 0; |
c1bb9350 | 2920 | |
9a76adeb | 2921 | strbuf_init(&buf, 0); |
b5767dd6 | 2922 | patch_input_file = filename; |
9a76adeb | 2923 | read_patch_file(&buf, fd); |
c1bb9350 | 2924 | offset = 0; |
9a76adeb | 2925 | while (offset < buf.len) { |
19c58fb8 LT |
2926 | struct patch *patch; |
2927 | int nr; | |
2928 | ||
90321c10 | 2929 | patch = xcalloc(1, sizeof(*patch)); |
3eaa38da | 2930 | patch->inaccurate_eof = inaccurate_eof; |
f94bf440 | 2931 | nr = parse_chunk(buf.buf + offset, buf.len - offset, patch); |
c1bb9350 LT |
2932 | if (nr < 0) |
2933 | break; | |
f686d030 | 2934 | if (apply_in_reverse) |
e5a94313 | 2935 | reverse_patches(patch); |
56185f49 JH |
2936 | if (prefix) |
2937 | prefix_patches(patch); | |
d854f783 JH |
2938 | if (use_patch(patch)) { |
2939 | patch_stats(patch); | |
2940 | *listp = patch; | |
2941 | listp = &patch->next; | |
56185f49 JH |
2942 | } |
2943 | else { | |
d854f783 JH |
2944 | /* perhaps free it a bit better? */ |
2945 | free(patch); | |
2946 | skipped_patch++; | |
2947 | } | |
c1bb9350 | 2948 | offset += nr; |
c1bb9350 | 2949 | } |
19c58fb8 | 2950 | |
81bf96bb | 2951 | if (whitespace_error && (ws_error_action == die_on_ws_error)) |
b5767dd6 JH |
2952 | apply = 0; |
2953 | ||
7da3bf37 JH |
2954 | update_index = check_index && apply; |
2955 | if (update_index && newfd < 0) | |
30ca07a2 JH |
2956 | newfd = hold_locked_index(&lock_file, 1); |
2957 | ||
5aa7d94c LT |
2958 | if (check_index) { |
2959 | if (read_cache() < 0) | |
2960 | die("unable to read index file"); | |
2961 | } | |
2962 | ||
57dc397c JH |
2963 | if ((check || apply) && |
2964 | check_patch_list(list) < 0 && | |
2965 | !apply_with_reject) | |
a577284a LT |
2966 | exit(1); |
2967 | ||
57dc397c JH |
2968 | if (apply && write_out_results(list, skipped_patch)) |
2969 | exit(1); | |
5aa7d94c | 2970 | |
7a988699 JS |
2971 | if (fake_ancestor) |
2972 | build_fake_ancestor(list, fake_ancestor); | |
2cf67f1e | 2973 | |
a577284a LT |
2974 | if (diffstat) |
2975 | stat_patch_list(list); | |
19c58fb8 | 2976 | |
7d8b7c21 JH |
2977 | if (numstat) |
2978 | numstat_patch_list(list); | |
2979 | ||
96c912a4 JH |
2980 | if (summary) |
2981 | summary_patch_list(list); | |
2982 | ||
9a76adeb | 2983 | strbuf_release(&buf); |
c1bb9350 LT |
2984 | return 0; |
2985 | } | |
2986 | ||
ef90d6d4 | 2987 | static int git_apply_config(const char *var, const char *value, void *cb) |
2ae1c53b | 2988 | { |
8e4c6aa1 SB |
2989 | if (!strcmp(var, "apply.whitespace")) |
2990 | return git_config_string(&apply_default_whitespace, var, value); | |
ef90d6d4 | 2991 | return git_default_config(var, value, cb); |
2ae1c53b JH |
2992 | } |
2993 | ||
2994 | ||
cd554bb1 | 2995 | int cmd_apply(int argc, const char **argv, const char *unused_prefix) |
c1bb9350 LT |
2996 | { |
2997 | int i; | |
4dfdbe10 | 2998 | int read_stdin = 1; |
3eaa38da | 2999 | int inaccurate_eof = 0; |
57dc397c | 3000 | int errs = 0; |
af05d679 | 3001 | int is_not_gitdir; |
3eaa38da | 3002 | |
2ae1c53b | 3003 | const char *whitespace_option = NULL; |
c1bb9350 | 3004 | |
dc7b2436 JH |
3005 | prefix = setup_git_directory_gently(&is_not_gitdir); |
3006 | prefix_length = prefix ? strlen(prefix) : 0; | |
ef90d6d4 | 3007 | git_config(git_apply_config, NULL); |
700ea479 JH |
3008 | if (apply_default_whitespace) |
3009 | parse_whitespace_option(apply_default_whitespace); | |
67160271 | 3010 | |
c1bb9350 LT |
3011 | for (i = 1; i < argc; i++) { |
3012 | const char *arg = argv[i]; | |
47495887 | 3013 | char *end; |
c1bb9350 LT |
3014 | int fd; |
3015 | ||
3016 | if (!strcmp(arg, "-")) { | |
57dc397c | 3017 | errs |= apply_patch(0, "<stdin>", inaccurate_eof); |
4dfdbe10 | 3018 | read_stdin = 0; |
c1bb9350 LT |
3019 | continue; |
3020 | } | |
cc44c765 | 3021 | if (!prefixcmp(arg, "--exclude=")) { |
d854f783 JH |
3022 | struct excludes *x = xmalloc(sizeof(*x)); |
3023 | x->path = arg + 10; | |
3024 | x->next = excludes; | |
3025 | excludes = x; | |
3026 | continue; | |
3027 | } | |
cc44c765 | 3028 | if (!prefixcmp(arg, "-p")) { |
e36f8b60 | 3029 | p_value = atoi(arg + 2); |
3e8a5db9 | 3030 | p_value_known = 1; |
e36f8b60 DB |
3031 | continue; |
3032 | } | |
cb93c193 JH |
3033 | if (!strcmp(arg, "--no-add")) { |
3034 | no_add = 1; | |
3035 | continue; | |
3036 | } | |
fab2c257 | 3037 | if (!strcmp(arg, "--stat")) { |
a577284a | 3038 | apply = 0; |
fab2c257 LT |
3039 | diffstat = 1; |
3040 | continue; | |
3041 | } | |
0660626c JH |
3042 | if (!strcmp(arg, "--allow-binary-replacement") || |
3043 | !strcmp(arg, "--binary")) { | |
2b6eef94 | 3044 | continue; /* now no-op */ |
011f4274 | 3045 | } |
7d8b7c21 JH |
3046 | if (!strcmp(arg, "--numstat")) { |
3047 | apply = 0; | |
3048 | numstat = 1; | |
3049 | continue; | |
3050 | } | |
96c912a4 JH |
3051 | if (!strcmp(arg, "--summary")) { |
3052 | apply = 0; | |
3053 | summary = 1; | |
3054 | continue; | |
3055 | } | |
a577284a LT |
3056 | if (!strcmp(arg, "--check")) { |
3057 | apply = 0; | |
3058 | check = 1; | |
3059 | continue; | |
3060 | } | |
3cca928d | 3061 | if (!strcmp(arg, "--index")) { |
dc7b2436 JH |
3062 | if (is_not_gitdir) |
3063 | die("--index outside a repository"); | |
3cca928d LT |
3064 | check_index = 1; |
3065 | continue; | |
3066 | } | |
04e4888e | 3067 | if (!strcmp(arg, "--cached")) { |
dc7b2436 JH |
3068 | if (is_not_gitdir) |
3069 | die("--cached outside a repository"); | |
04e4888e JH |
3070 | check_index = 1; |
3071 | cached = 1; | |
3072 | continue; | |
3073 | } | |
aefa4a5b LT |
3074 | if (!strcmp(arg, "--apply")) { |
3075 | apply = 1; | |
3076 | continue; | |
3077 | } | |
7a988699 | 3078 | if (!strcmp(arg, "--build-fake-ancestor")) { |
2cf67f1e | 3079 | apply = 0; |
7a988699 JS |
3080 | if (++i >= argc) |
3081 | die ("need a filename"); | |
3082 | fake_ancestor = argv[i]; | |
2cf67f1e JH |
3083 | continue; |
3084 | } | |
22943f1a JH |
3085 | if (!strcmp(arg, "-z")) { |
3086 | line_termination = 0; | |
3087 | continue; | |
3088 | } | |
cc44c765 | 3089 | if (!prefixcmp(arg, "-C")) { |
47495887 EB |
3090 | p_context = strtoul(arg + 2, &end, 0); |
3091 | if (*end != '\0') | |
3092 | die("unrecognized context count '%s'", arg + 2); | |
3093 | continue; | |
3094 | } | |
cc44c765 | 3095 | if (!prefixcmp(arg, "--whitespace=")) { |
2ae1c53b JH |
3096 | whitespace_option = arg + 13; |
3097 | parse_whitespace_option(arg + 13); | |
3098 | continue; | |
19bfcd5a | 3099 | } |
e5a94313 | 3100 | if (!strcmp(arg, "-R") || !strcmp(arg, "--reverse")) { |
f686d030 | 3101 | apply_in_reverse = 1; |
e5a94313 | 3102 | continue; |
4be60962 JH |
3103 | } |
3104 | if (!strcmp(arg, "--unidiff-zero")) { | |
3105 | unidiff_zero = 1; | |
3106 | continue; | |
e5a94313 | 3107 | } |
57dc397c | 3108 | if (!strcmp(arg, "--reject")) { |
8938045a | 3109 | apply = apply_with_reject = apply_verbosely = 1; |
57dc397c JH |
3110 | continue; |
3111 | } | |
aeabfa07 | 3112 | if (!strcmp(arg, "-v") || !strcmp(arg, "--verbose")) { |
a2bf404e JH |
3113 | apply_verbosely = 1; |
3114 | continue; | |
3115 | } | |
3eaa38da JS |
3116 | if (!strcmp(arg, "--inaccurate-eof")) { |
3117 | inaccurate_eof = 1; | |
3118 | continue; | |
3119 | } | |
edf2e370 JH |
3120 | if (0 < prefix_length) |
3121 | arg = prefix_filename(prefix, prefix_length, arg); | |
3122 | ||
c1bb9350 LT |
3123 | fd = open(arg, O_RDONLY); |
3124 | if (fd < 0) | |
1da16439 | 3125 | die("can't open patch '%s': %s", arg, strerror(errno)); |
4dfdbe10 | 3126 | read_stdin = 0; |
f21d6726 | 3127 | set_default_whitespace_mode(whitespace_option); |
57dc397c | 3128 | errs |= apply_patch(fd, arg, inaccurate_eof); |
c1bb9350 LT |
3129 | close(fd); |
3130 | } | |
f21d6726 | 3131 | set_default_whitespace_mode(whitespace_option); |
4dfdbe10 | 3132 | if (read_stdin) |
57dc397c | 3133 | errs |= apply_patch(0, "<stdin>", inaccurate_eof); |
fc96b7c9 JH |
3134 | if (whitespace_error) { |
3135 | if (squelch_whitespace_errors && | |
3136 | squelch_whitespace_errors < whitespace_error) { | |
3137 | int squelched = | |
3138 | whitespace_error - squelch_whitespace_errors; | |
57dc397c JH |
3139 | fprintf(stderr, "warning: squelched %d " |
3140 | "whitespace error%s\n", | |
fc96b7c9 JH |
3141 | squelched, |
3142 | squelched == 1 ? "" : "s"); | |
3143 | } | |
81bf96bb | 3144 | if (ws_error_action == die_on_ws_error) |
c94bf41c | 3145 | die("%d line%s add%s whitespace errors.", |
fc96b7c9 JH |
3146 | whitespace_error, |
3147 | whitespace_error == 1 ? "" : "s", | |
3148 | whitespace_error == 1 ? "s" : ""); | |
d8c37945 | 3149 | if (applied_after_fixing_ws && apply) |
fc96b7c9 | 3150 | fprintf(stderr, "warning: %d line%s applied after" |
c94bf41c JH |
3151 | " fixing whitespace errors.\n", |
3152 | applied_after_fixing_ws, | |
3153 | applied_after_fixing_ws == 1 ? "" : "s"); | |
fc96b7c9 | 3154 | else if (whitespace_error) |
c94bf41c | 3155 | fprintf(stderr, "warning: %d line%s add%s whitespace errors.\n", |
fc96b7c9 JH |
3156 | whitespace_error, |
3157 | whitespace_error == 1 ? "" : "s", | |
3158 | whitespace_error == 1 ? "s" : ""); | |
3159 | } | |
dbd0f7d3 | 3160 | |
7da3bf37 | 3161 | if (update_index) { |
dbd0f7d3 | 3162 | if (write_cache(newfd, active_cache, active_nr) || |
4ed7cd3a | 3163 | commit_locked_index(&lock_file)) |
021b6e45 | 3164 | die("Unable to write new index file"); |
dbd0f7d3 EW |
3165 | } |
3166 | ||
57dc397c | 3167 | return !!errs; |
c1bb9350 | 3168 | } |