blob: 7b404ef6601e5b7820e9b1b6812225639e3ea4b1 [file] [log] [blame]
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001/*
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 *
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07008 */
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07009#include "cache.h"
Junio C Hamano03ac6e62006-04-23 16:52:52 -070010#include "cache-tree.h"
Junio C Hamano22943f12005-10-14 21:54:52 -070011#include "quote.h"
Peter Eriksen8e440252006-04-02 14:44:09 +020012#include "blob.h"
Junio C Hamano051308f2006-05-04 16:51:44 -070013#include "delta.h"
Peter Eriksenac6245e2006-05-23 14:15:34 +020014#include "builtin.h"
Johannes Schindelinc455c872008-07-21 19:03:49 +010015#include "string-list.h"
Alex Riesen175a4942008-09-27 00:59:14 +020016#include "dir.h"
Miklos Vajnaf26c4942008-12-28 00:03:57 +010017#include "parse-options.h"
Linus Torvaldsc1bb9352005-05-23 10:52:17 -070018
Pavel Roskina9486b02006-07-10 02:57:51 -040019/*
20 * --check turns on checking that the working tree matches the
21 * files that are being modified, but doesn't apply the patch
22 * --stat does just a diffstat, and doesn't actually apply
23 * --numstat does numeric diffstat, and doesn't actually apply
24 * --index-info shows the old and new index info for paths if available.
25 * --index updates the cache as well.
26 * --cached updates only the cache without ever touching the working tree.
27 */
Junio C Hamanoedf2e372005-11-25 23:14:15 -080028static const char *prefix;
29static int prefix_length = -1;
Eric Wongdbd0f7d2006-05-09 01:08:23 -070030static int newfd = -1;
Junio C Hamanoedf2e372005-11-25 23:14:15 -080031
Junio C Hamano4be60962006-09-17 01:04:24 -070032static int unidiff_zero;
Daniel Barkalowe36f8b62006-01-31 00:36:24 -050033static int p_value = 1;
Junio C Hamano3e8a5db2007-02-21 16:05:56 -080034static int p_value_known;
David Rientjes96f1e582006-08-15 10:23:48 -070035static int check_index;
Junio C Hamano7da3bf32007-04-01 22:46:06 -070036static int update_index;
David Rientjes96f1e582006-08-15 10:23:48 -070037static int cached;
38static int diffstat;
39static int numstat;
40static int summary;
41static int check;
Linus Torvaldsa5772842005-05-26 15:10:02 -070042static int apply = 1;
David Rientjes96f1e582006-08-15 10:23:48 -070043static int apply_in_reverse;
Junio C Hamano57dc3972006-08-16 17:55:29 -070044static int apply_with_reject;
Junio C Hamanoa2bf4042006-08-18 03:14:48 -070045static int apply_verbosely;
David Rientjes96f1e582006-08-15 10:23:48 -070046static int no_add;
Johannes Schindelin7a988692007-09-17 23:34:06 +010047static const char *fake_ancestor;
Junio C Hamano22943f12005-10-14 21:54:52 -070048static int line_termination = '\n';
Miklos Vajnaf26c4942008-12-28 00:03:57 +010049static unsigned int p_context = UINT_MAX;
50static const char * const apply_usage[] = {
51 "git apply [options] [<patch>...]",
52 NULL
53};
Linus Torvaldsc1bb9352005-05-23 10:52:17 -070054
Junio C Hamano81bf96b2007-11-23 02:37:03 -080055static enum ws_error_action {
56 nowarn_ws_error,
57 warn_on_ws_error,
58 die_on_ws_error,
59 correct_ws_error,
60} ws_error_action = warn_on_ws_error;
David Rientjes96f1e582006-08-15 10:23:48 -070061static int whitespace_error;
Junio C Hamanofc96b7c2006-02-27 14:16:30 -080062static int squelch_whitespace_errors = 5;
Junio C Hamanoc94bf412007-06-02 19:55:54 -070063static int applied_after_fixing_ws;
David Rientjes96f1e582006-08-15 10:23:48 -070064static const char *patch_input_file;
Johannes Schindelinc4730f32008-07-01 00:44:47 +010065static const char *root;
66static int root_len;
Miklos Vajnaf26c4942008-12-28 00:03:57 +010067static int read_stdin = 1;
68static int options;
Linus Torvalds19bfcd52006-02-26 09:29:00 -080069
Junio C Hamano2ae1c532006-02-27 14:47:45 -080070static void parse_whitespace_option(const char *option)
71{
72 if (!option) {
Junio C Hamano81bf96b2007-11-23 02:37:03 -080073 ws_error_action = warn_on_ws_error;
Junio C Hamano2ae1c532006-02-27 14:47:45 -080074 return;
75 }
76 if (!strcmp(option, "warn")) {
Junio C Hamano81bf96b2007-11-23 02:37:03 -080077 ws_error_action = warn_on_ws_error;
Junio C Hamano2ae1c532006-02-27 14:47:45 -080078 return;
79 }
Junio C Hamano621603b2006-02-27 17:07:16 -080080 if (!strcmp(option, "nowarn")) {
Junio C Hamano81bf96b2007-11-23 02:37:03 -080081 ws_error_action = nowarn_ws_error;
Junio C Hamano621603b2006-02-27 17:07:16 -080082 return;
83 }
Junio C Hamano2ae1c532006-02-27 14:47:45 -080084 if (!strcmp(option, "error")) {
Junio C Hamano81bf96b2007-11-23 02:37:03 -080085 ws_error_action = die_on_ws_error;
Junio C Hamano2ae1c532006-02-27 14:47:45 -080086 return;
87 }
88 if (!strcmp(option, "error-all")) {
Junio C Hamano81bf96b2007-11-23 02:37:03 -080089 ws_error_action = die_on_ws_error;
Junio C Hamano2ae1c532006-02-27 14:47:45 -080090 squelch_whitespace_errors = 0;
91 return;
92 }
Junio C Hamano81bf96b2007-11-23 02:37:03 -080093 if (!strcmp(option, "strip") || !strcmp(option, "fix")) {
94 ws_error_action = correct_ws_error;
Junio C Hamano2ae1c532006-02-27 14:47:45 -080095 return;
96 }
97 die("unrecognized whitespace option '%s'", option);
98}
99
Junio C Hamanof21d6722006-02-28 01:12:52 -0800100static void set_default_whitespace_mode(const char *whitespace_option)
101{
Junio C Hamano81bf96b2007-11-23 02:37:03 -0800102 if (!whitespace_option && !apply_default_whitespace)
103 ws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error);
Junio C Hamanof21d6722006-02-28 01:12:52 -0800104}
105
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700106/*
Linus Torvalds3f403152005-05-26 11:40:43 -0700107 * For "diff-stat" like behaviour, we keep track of the biggest change
108 * we've seen, and the longest filename. That allows us to do simple
109 * scaling.
110 */
111static int max_change, max_len;
112
113/*
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700114 * Various "current state", notably line numbers and what
115 * file (and how) we're patching right now.. The "is_xxxx"
116 * things are flags, where -1 means "don't know yet".
117 */
Linus Torvalds46979f52005-05-23 14:38:49 -0700118static int linenr = 1;
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700119
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -0700120/*
121 * This represents one "hunk" from a patch, starting with
122 * "@@ -oldpos,oldlines +newpos,newlines @@" marker. The
123 * patch text is pointed at by patch, and its byte length
124 * is stored in size. leading and trailing are the number
125 * of context lines.
126 */
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700127struct fragment {
Eric W. Biederman47495882006-04-10 03:33:06 -0600128 unsigned long leading, trailing;
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700129 unsigned long oldpos, oldlines;
130 unsigned long newpos, newlines;
131 const char *patch;
132 int size;
Junio C Hamano57dc3972006-08-16 17:55:29 -0700133 int rejected;
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700134 struct fragment *next;
135};
136
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -0700137/*
138 * When dealing with a binary patch, we reuse "leading" field
139 * to store the type of the binary hunk, either deflated "delta"
140 * or deflated "literal".
141 */
142#define binary_patch_method leading
143#define BINARY_DELTA_DEFLATED 1
144#define BINARY_LITERAL_DEFLATED 2
145
Junio C Hamano81bf96b2007-11-23 02:37:03 -0800146/*
147 * This represents a "patch" to a file, both metainfo changes
148 * such as creation/deletion, filemode and content changes represented
149 * as a series of fragments.
150 */
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700151struct patch {
Linus Torvalds5041aa72005-05-26 13:11:24 -0700152 char *new_name, *old_name, *def_name;
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700153 unsigned int old_mode, new_mode;
Rene Scharfe3dad11b2006-11-18 13:07:09 +0100154 int is_new, is_delete; /* -1 = unknown, 0 = false, 1 = true */
Junio C Hamano57dc3972006-08-16 17:55:29 -0700155 int rejected;
Junio C Hamanocf1b7862007-12-06 00:14:14 -0800156 unsigned ws_rule;
Junio C Hamano06606262006-05-05 02:41:53 -0700157 unsigned long deflate_origlen;
Linus Torvalds3f403152005-05-26 11:40:43 -0700158 int lines_added, lines_deleted;
Junio C Hamano96c912a2005-06-22 02:29:46 -0700159 int score;
Junio C Hamano9987d7c2007-02-21 14:31:10 -0800160 unsigned int is_toplevel_relative:1;
Rene Scharfe3dad11b2006-11-18 13:07:09 +0100161 unsigned int inaccurate_eof:1;
162 unsigned int is_binary:1;
163 unsigned int is_copy:1;
164 unsigned int is_rename:1;
Johannes Schindelinc14b9d12008-06-27 18:43:09 +0100165 unsigned int recount:1;
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700166 struct fragment *fragments;
Linus Torvalds5aa7d942005-06-05 14:05:43 -0700167 char *result;
René Scharfec32f7492007-10-21 11:23:49 +0200168 size_t resultsize;
Junio C Hamano2cf67f12005-10-07 03:42:00 -0700169 char old_sha1_prefix[41];
170 char new_sha1_prefix[41];
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700171 struct patch *next;
172};
Linus Torvalds46979f52005-05-23 14:38:49 -0700173
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800174/*
175 * A line in a file, len-bytes long (includes the terminating LF,
176 * except for an incomplete line at the end if the file ends with
177 * one), and its contents hashes to 'hash'.
178 */
179struct line {
180 size_t len;
181 unsigned hash : 24;
182 unsigned flag : 8;
Junio C Hamanoc330fdd2008-01-29 00:17:55 -0800183#define LINE_COMMON 1
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800184};
185
186/*
187 * This represents a "file", which is an array of "lines".
188 */
189struct image {
190 char *buf;
191 size_t len;
192 size_t nr;
Junio C Hamanoc330fdd2008-01-29 00:17:55 -0800193 size_t alloc;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800194 struct line *line_allocated;
195 struct line *line;
196};
197
Don Zickus7a078412008-06-27 14:39:12 -0400198/*
199 * Records filenames that have been touched, in order to handle
200 * the case where more than one patches touch the same file.
201 */
202
Johannes Schindelinc455c872008-07-21 19:03:49 +0100203static struct string_list fn_table;
Don Zickus7a078412008-06-27 14:39:12 -0400204
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800205static uint32_t hash_line(const char *cp, size_t len)
206{
207 size_t i;
208 uint32_t h;
209 for (i = 0, h = 0; i < len; i++) {
210 if (!isspace(cp[i])) {
211 h = h * 3 + (cp[i] & 0xff);
212 }
213 }
214 return h;
215}
216
Junio C Hamanoc330fdd2008-01-29 00:17:55 -0800217static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag)
218{
219 ALLOC_GROW(img->line_allocated, img->nr + 1, img->alloc);
220 img->line_allocated[img->nr].len = len;
221 img->line_allocated[img->nr].hash = hash_line(bol, len);
222 img->line_allocated[img->nr].flag = flag;
223 img->nr++;
224}
225
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800226static void prepare_image(struct image *image, char *buf, size_t len,
227 int prepare_linetable)
228{
229 const char *cp, *ep;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800230
Junio C Hamanoc330fdd2008-01-29 00:17:55 -0800231 memset(image, 0, sizeof(*image));
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800232 image->buf = buf;
233 image->len = len;
234
Junio C Hamanoc330fdd2008-01-29 00:17:55 -0800235 if (!prepare_linetable)
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800236 return;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800237
238 ep = image->buf + image->len;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800239 cp = image->buf;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800240 while (cp < ep) {
241 const char *next;
242 for (next = cp; next < ep && *next != '\n'; next++)
243 ;
244 if (next < ep)
245 next++;
Junio C Hamanoc330fdd2008-01-29 00:17:55 -0800246 add_line_info(image, cp, next - cp, 0);
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800247 cp = next;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800248 }
Junio C Hamanoc330fdd2008-01-29 00:17:55 -0800249 image->line = image->line_allocated;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -0800250}
251
252static void clear_image(struct image *image)
253{
254 free(image->buf);
255 image->buf = NULL;
256 image->len = 0;
257}
258
Junio C Hamano81bf96b2007-11-23 02:37:03 -0800259static void say_patch_name(FILE *output, const char *pre,
260 struct patch *patch, const char *post)
Junio C Hamanoa2bf4042006-08-18 03:14:48 -0700261{
262 fputs(pre, output);
263 if (patch->old_name && patch->new_name &&
264 strcmp(patch->old_name, patch->new_name)) {
Pierre Habouzit663af342007-09-20 00:42:15 +0200265 quote_c_style(patch->old_name, NULL, output, 0);
Junio C Hamanoa2bf4042006-08-18 03:14:48 -0700266 fputs(" => ", output);
Pierre Habouzit663af342007-09-20 00:42:15 +0200267 quote_c_style(patch->new_name, NULL, output, 0);
268 } else {
Junio C Hamanoa2bf4042006-08-18 03:14:48 -0700269 const char *n = patch->new_name;
270 if (!n)
271 n = patch->old_name;
Pierre Habouzit663af342007-09-20 00:42:15 +0200272 quote_c_style(n, NULL, output, 0);
Junio C Hamanoa2bf4042006-08-18 03:14:48 -0700273 }
274 fputs(post, output);
275}
276
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700277#define CHUNKSIZE (8192)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700278#define SLOP (16)
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700279
Pierre Habouzit9a76ade2007-09-27 13:33:19 +0200280static void read_patch_file(struct strbuf *sb, int fd)
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700281{
Pierre Habouzit9a76ade2007-09-27 13:33:19 +0200282 if (strbuf_read(sb, fd, 0) < 0)
Heikki Orsila34baebc2008-08-30 14:12:53 +0300283 die("git apply: read returned %s", strerror(errno));
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700284
285 /*
286 * Make sure that we have some slop in the buffer
287 * so that we can do speculative "memcmp" etc, and
288 * see to it that it is NUL-filled.
289 */
Pierre Habouzit9a76ade2007-09-27 13:33:19 +0200290 strbuf_grow(sb, SLOP);
291 memset(sb->buf + sb->len, 0, SLOP);
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700292}
293
Linus Torvalds3cca9282005-06-05 11:03:13 -0700294static unsigned long linelen(const char *buffer, unsigned long size)
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700295{
296 unsigned long len = 0;
297 while (size--) {
298 len++;
299 if (*buffer++ == '\n')
300 break;
301 }
302 return len;
303}
304
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700305static int is_dev_null(const char *str)
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700306{
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700307 return !memcmp("/dev/null", str, 9) && isspace(str[9]);
308}
309
Linus Torvalds381ca9a2005-05-31 15:05:59 -0700310#define TERM_SPACE 1
311#define TERM_TAB 2
Linus Torvalds9a4a1002005-05-23 19:13:55 -0700312
313static int name_terminate(const char *name, int namelen, int c, int terminate)
314{
315 if (c == ' ' && !(terminate & TERM_SPACE))
316 return 0;
317 if (c == '\t' && !(terminate & TERM_TAB))
318 return 0;
319
Linus Torvalds9a4a1002005-05-23 19:13:55 -0700320 return 1;
321}
322
Junio C Hamano56185f42007-02-19 17:57:29 -0800323static char *find_name(const char *line, char *def, int p_value, int terminate)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700324{
325 int len;
326 const char *start = line;
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700327
Junio C Hamano22943f12005-10-14 21:54:52 -0700328 if (*line == '"') {
Brandon Caseyf285a2d2008-10-09 14:12:12 -0500329 struct strbuf name = STRBUF_INIT;
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200330
Junio C Hamano81bf96b2007-11-23 02:37:03 -0800331 /*
332 * Proposed "new-style" GNU patch/diff format; see
Junio C Hamano22943f12005-10-14 21:54:52 -0700333 * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2
334 */
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200335 if (!unquote_c_style(&name, line, NULL)) {
336 char *cp;
337
338 for (cp = name.buf; p_value; p_value--) {
Pierre Habouzit3d845d72007-09-18 12:12:58 +0200339 cp = strchr(cp, '/');
Junio C Hamano22943f12005-10-14 21:54:52 -0700340 if (!cp)
341 break;
342 cp++;
Junio C Hamano22943f12005-10-14 21:54:52 -0700343 }
344 if (cp) {
345 /* name can later be freed, so we need
346 * to memmove, not just return cp
347 */
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200348 strbuf_remove(&name, 0, cp - name.buf);
Junio C Hamano22943f12005-10-14 21:54:52 -0700349 free(def);
Johannes Schindelinc4730f32008-07-01 00:44:47 +0100350 if (root)
351 strbuf_insert(&name, 0, root, root_len);
Pierre Habouzitb315c5c2007-09-27 12:58:23 +0200352 return strbuf_detach(&name, NULL);
Junio C Hamano22943f12005-10-14 21:54:52 -0700353 }
354 }
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200355 strbuf_release(&name);
Junio C Hamano22943f12005-10-14 21:54:52 -0700356 }
357
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700358 for (;;) {
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700359 char c = *line;
Linus Torvalds9a4a1002005-05-23 19:13:55 -0700360
361 if (isspace(c)) {
362 if (c == '\n')
363 break;
364 if (name_terminate(start, line-start, c, terminate))
365 break;
366 }
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700367 line++;
368 if (c == '/' && !--p_value)
369 start = line;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700370 }
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700371 if (!start)
372 return def;
373 len = line - start;
374 if (!len)
375 return def;
376
377 /*
378 * Generally we prefer the shorter name, especially
379 * if the other one is just a variation of that with
380 * something else tacked on to the end (ie "file.orig"
381 * or "file~").
382 */
383 if (def) {
384 int deflen = strlen(def);
385 if (deflen < len && !strncmp(start, def, deflen))
386 return def;
Junio C Hamanoca032832007-09-19 01:37:50 -0700387 free(def);
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700388 }
389
Johannes Schindelinc4730f32008-07-01 00:44:47 +0100390 if (root) {
391 char *ret = xmalloc(root_len + len + 1);
392 strcpy(ret, root);
393 memcpy(ret + root_len, start, len);
394 ret[root_len + len] = '\0';
395 return ret;
396 }
397
Pierre Habouzit182af832007-09-16 00:32:36 +0200398 return xmemdupz(start, len);
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700399}
400
Junio C Hamano3e8a5db2007-02-21 16:05:56 -0800401static int count_slashes(const char *cp)
402{
403 int cnt = 0;
404 char ch;
405
406 while ((ch = *cp++))
407 if (ch == '/')
408 cnt++;
409 return cnt;
410}
411
412/*
413 * Given the string after "--- " or "+++ ", guess the appropriate
414 * p_value for the given patch.
415 */
416static int guess_p_value(const char *nameline)
417{
418 char *name, *cp;
419 int val = -1;
420
421 if (is_dev_null(nameline))
422 return -1;
423 name = find_name(nameline, NULL, 0, TERM_SPACE | TERM_TAB);
424 if (!name)
425 return -1;
426 cp = strchr(name, '/');
427 if (!cp)
428 val = 0;
429 else if (prefix) {
430 /*
431 * Does it begin with "a/$our-prefix" and such? Then this is
432 * very likely to apply to our directory.
433 */
434 if (!strncmp(name, prefix, prefix_length))
435 val = count_slashes(prefix);
436 else {
437 cp++;
438 if (!strncmp(cp, prefix, prefix_length))
439 val = count_slashes(prefix) + 1;
440 }
441 }
442 free(name);
443 return val;
444}
445
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700446/*
Junio C Hamano88f6dba2008-05-17 01:46:47 -0700447 * Get the name etc info from the ---/+++ lines of a traditional patch header
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700448 *
Linus Torvalds9a4a1002005-05-23 19:13:55 -0700449 * FIXME! The end-of-filename heuristics are kind of screwy. For existing
450 * files, we can happily check the index for a match, but for creating a
451 * new file we should try to match whatever "patch" does. I have no idea.
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700452 */
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700453static void parse_traditional_patch(const char *first, const char *second, struct patch *patch)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700454{
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700455 char *name;
456
Pavel Roskina9486b02006-07-10 02:57:51 -0400457 first += 4; /* skip "--- " */
458 second += 4; /* skip "+++ " */
Junio C Hamano3e8a5db2007-02-21 16:05:56 -0800459 if (!p_value_known) {
460 int p, q;
461 p = guess_p_value(first);
462 q = guess_p_value(second);
463 if (p < 0) p = q;
464 if (0 <= p && p == q) {
465 p_value = p;
466 p_value_known = 1;
467 }
468 }
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700469 if (is_dev_null(first)) {
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700470 patch->is_new = 1;
471 patch->is_delete = 0;
Linus Torvalds5041aa72005-05-26 13:11:24 -0700472 name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700473 patch->new_name = name;
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700474 } else if (is_dev_null(second)) {
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700475 patch->is_new = 0;
476 patch->is_delete = 1;
Linus Torvalds381ca9a2005-05-31 15:05:59 -0700477 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700478 patch->old_name = name;
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700479 } else {
Linus Torvalds381ca9a2005-05-31 15:05:59 -0700480 name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
481 name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700482 patch->old_name = patch->new_name = name;
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700483 }
484 if (!name)
485 die("unable to find filename in patch at line %d", linenr);
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700486}
487
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700488static int gitdiff_hdrend(const char *line, struct patch *patch)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700489{
490 return -1;
491}
492
Linus Torvalds1e3f6b62005-05-23 19:54:55 -0700493/*
494 * We're anal about diff header consistency, to make
495 * sure that we don't end up having strange ambiguous
496 * patches floating around.
497 *
498 * As a result, gitdiff_{old|new}name() will check
499 * their names against any previous information, just
500 * to make sure..
501 */
502static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
503{
Linus Torvalds1e3f6b62005-05-23 19:54:55 -0700504 if (!orig_name && !isnull)
Shawn O. Pearce79ee1942007-04-04 11:19:14 -0400505 return find_name(line, NULL, p_value, TERM_TAB);
Linus Torvalds1e3f6b62005-05-23 19:54:55 -0700506
Linus Torvalds1e3f6b62005-05-23 19:54:55 -0700507 if (orig_name) {
Junio C Hamano22943f12005-10-14 21:54:52 -0700508 int len;
509 const char *name;
510 char *another;
Linus Torvalds1e3f6b62005-05-23 19:54:55 -0700511 name = orig_name;
512 len = strlen(name);
513 if (isnull)
Junio C Hamano7e44c932008-08-31 09:39:19 -0700514 die("git apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
Shawn O. Pearce79ee1942007-04-04 11:19:14 -0400515 another = find_name(line, NULL, p_value, TERM_TAB);
Junio C Hamano22943f12005-10-14 21:54:52 -0700516 if (!another || memcmp(another, name, len))
Junio C Hamano7e44c932008-08-31 09:39:19 -0700517 die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
Junio C Hamano22943f12005-10-14 21:54:52 -0700518 free(another);
Linus Torvalds1e3f6b62005-05-23 19:54:55 -0700519 return orig_name;
520 }
Junio C Hamano22943f12005-10-14 21:54:52 -0700521 else {
522 /* expect "/dev/null" */
523 if (memcmp("/dev/null", line, 9) || line[9] != '\n')
Junio C Hamano7e44c932008-08-31 09:39:19 -0700524 die("git apply: bad git-diff - expected /dev/null on line %d", linenr);
Junio C Hamano22943f12005-10-14 21:54:52 -0700525 return NULL;
526 }
Linus Torvalds1e3f6b62005-05-23 19:54:55 -0700527}
528
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700529static int gitdiff_oldname(const char *line, struct patch *patch)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700530{
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700531 patch->old_name = gitdiff_verify_name(line, patch->is_new, patch->old_name, "old");
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700532 return 0;
533}
534
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700535static int gitdiff_newname(const char *line, struct patch *patch)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700536{
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700537 patch->new_name = gitdiff_verify_name(line, patch->is_delete, patch->new_name, "new");
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700538 return 0;
539}
540
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700541static int gitdiff_oldmode(const char *line, struct patch *patch)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700542{
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700543 patch->old_mode = strtoul(line, NULL, 8);
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700544 return 0;
545}
546
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700547static int gitdiff_newmode(const char *line, struct patch *patch)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700548{
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700549 patch->new_mode = strtoul(line, NULL, 8);
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700550 return 0;
551}
552
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700553static int gitdiff_delete(const char *line, struct patch *patch)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700554{
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700555 patch->is_delete = 1;
Linus Torvalds5041aa72005-05-26 13:11:24 -0700556 patch->old_name = patch->def_name;
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700557 return gitdiff_oldmode(line, patch);
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700558}
559
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700560static int gitdiff_newfile(const char *line, struct patch *patch)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700561{
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700562 patch->is_new = 1;
Linus Torvalds5041aa72005-05-26 13:11:24 -0700563 patch->new_name = patch->def_name;
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700564 return gitdiff_newmode(line, patch);
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700565}
566
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700567static int gitdiff_copysrc(const char *line, struct patch *patch)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700568{
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700569 patch->is_copy = 1;
570 patch->old_name = find_name(line, NULL, 0, 0);
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700571 return 0;
572}
573
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700574static int gitdiff_copydst(const char *line, struct patch *patch)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700575{
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700576 patch->is_copy = 1;
577 patch->new_name = find_name(line, NULL, 0, 0);
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700578 return 0;
579}
580
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700581static int gitdiff_renamesrc(const char *line, struct patch *patch)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700582{
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700583 patch->is_rename = 1;
584 patch->old_name = find_name(line, NULL, 0, 0);
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700585 return 0;
586}
587
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700588static int gitdiff_renamedst(const char *line, struct patch *patch)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700589{
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700590 patch->is_rename = 1;
591 patch->new_name = find_name(line, NULL, 0, 0);
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700592 return 0;
593}
594
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700595static int gitdiff_similarity(const char *line, struct patch *patch)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700596{
Junio C Hamano96c912a2005-06-22 02:29:46 -0700597 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
598 patch->score = 0;
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700599 return 0;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700600}
601
Junio C Hamano70aadac2005-05-30 16:40:16 -0700602static int gitdiff_dissimilarity(const char *line, struct patch *patch)
603{
Junio C Hamano96c912a2005-06-22 02:29:46 -0700604 if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX)
605 patch->score = 0;
Junio C Hamano70aadac2005-05-30 16:40:16 -0700606 return 0;
607}
608
Junio C Hamano2cf67f12005-10-07 03:42:00 -0700609static int gitdiff_index(const char *line, struct patch *patch)
610{
Junio C Hamano81bf96b2007-11-23 02:37:03 -0800611 /*
612 * index line is N hexadecimal, "..", N hexadecimal,
Junio C Hamano2cf67f12005-10-07 03:42:00 -0700613 * and optional space with octal mode.
614 */
615 const char *ptr, *eol;
616 int len;
617
618 ptr = strchr(line, '.');
Junio C Hamano9add69b2005-11-14 17:15:07 -0800619 if (!ptr || ptr[1] != '.' || 40 < ptr - line)
Junio C Hamano2cf67f12005-10-07 03:42:00 -0700620 return 0;
621 len = ptr - line;
622 memcpy(patch->old_sha1_prefix, line, len);
623 patch->old_sha1_prefix[len] = 0;
624
625 line = ptr + 2;
626 ptr = strchr(line, ' ');
627 eol = strchr(line, '\n');
628
629 if (!ptr || eol < ptr)
630 ptr = eol;
631 len = ptr - line;
632
Junio C Hamano9add69b2005-11-14 17:15:07 -0800633 if (40 < len)
Junio C Hamano2cf67f12005-10-07 03:42:00 -0700634 return 0;
635 memcpy(patch->new_sha1_prefix, line, len);
636 patch->new_sha1_prefix[len] = 0;
637 if (*ptr == ' ')
Junio C Hamano1f7903a2009-01-02 02:55:37 -0800638 patch->old_mode = strtoul(ptr+1, NULL, 8);
Junio C Hamano2cf67f12005-10-07 03:42:00 -0700639 return 0;
640}
641
Linus Torvalds9a4a1002005-05-23 19:13:55 -0700642/*
643 * This is normal for a diff that doesn't change anything: we'll fall through
644 * into the next diff. Tell the parser to break out.
645 */
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700646static int gitdiff_unrecognized(const char *line, struct patch *patch)
Linus Torvalds9a4a1002005-05-23 19:13:55 -0700647{
648 return -1;
649}
650
Junio C Hamano22943f12005-10-14 21:54:52 -0700651static const char *stop_at_slash(const char *line, int llen)
652{
653 int i;
654
655 for (i = 0; i < llen; i++) {
656 int ch = line[i];
657 if (ch == '/')
658 return line + i;
659 }
660 return NULL;
661}
662
Junio C Hamano81bf96b2007-11-23 02:37:03 -0800663/*
664 * This is to extract the same name that appears on "diff --git"
Junio C Hamano22943f12005-10-14 21:54:52 -0700665 * line. We do not find and return anything if it is a rename
666 * patch, and it is OK because we will find the name elsewhere.
667 * We need to reliably find name only when it is mode-change only,
668 * creation or deletion of an empty file. In any of these cases,
669 * both sides are the same name under a/ and b/ respectively.
670 */
671static char *git_header_name(char *line, int llen)
Linus Torvalds5041aa72005-05-26 13:11:24 -0700672{
Junio C Hamano22943f12005-10-14 21:54:52 -0700673 const char *name;
674 const char *second = NULL;
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200675 size_t len;
Linus Torvalds5041aa72005-05-26 13:11:24 -0700676
Junio C Hamano22943f12005-10-14 21:54:52 -0700677 line += strlen("diff --git ");
678 llen -= strlen("diff --git ");
679
680 if (*line == '"') {
681 const char *cp;
Brandon Caseyf285a2d2008-10-09 14:12:12 -0500682 struct strbuf first = STRBUF_INIT;
683 struct strbuf sp = STRBUF_INIT;
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200684
685 if (unquote_c_style(&first, line, &second))
686 goto free_and_fail1;
Junio C Hamano22943f12005-10-14 21:54:52 -0700687
688 /* advance to the first slash */
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200689 cp = stop_at_slash(first.buf, first.len);
690 /* we do not accept absolute paths */
691 if (!cp || cp == first.buf)
692 goto free_and_fail1;
693 strbuf_remove(&first, 0, cp + 1 - first.buf);
Junio C Hamano22943f12005-10-14 21:54:52 -0700694
Junio C Hamano81bf96b2007-11-23 02:37:03 -0800695 /*
696 * second points at one past closing dq of name.
Junio C Hamano22943f12005-10-14 21:54:52 -0700697 * find the second name.
698 */
699 while ((second < line + llen) && isspace(*second))
700 second++;
701
702 if (line + llen <= second)
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200703 goto free_and_fail1;
Junio C Hamano22943f12005-10-14 21:54:52 -0700704 if (*second == '"') {
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200705 if (unquote_c_style(&sp, second, NULL))
706 goto free_and_fail1;
707 cp = stop_at_slash(sp.buf, sp.len);
708 if (!cp || cp == sp.buf)
709 goto free_and_fail1;
Junio C Hamano22943f12005-10-14 21:54:52 -0700710 /* They must match, otherwise ignore */
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200711 if (strcmp(cp + 1, first.buf))
712 goto free_and_fail1;
713 strbuf_release(&sp);
Pierre Habouzitb315c5c2007-09-27 12:58:23 +0200714 return strbuf_detach(&first, NULL);
Junio C Hamano22943f12005-10-14 21:54:52 -0700715 }
716
717 /* unquoted second */
718 cp = stop_at_slash(second, line + llen - second);
719 if (!cp || cp == second)
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200720 goto free_and_fail1;
Junio C Hamano22943f12005-10-14 21:54:52 -0700721 cp++;
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200722 if (line + llen - cp != first.len + 1 ||
723 memcmp(first.buf, cp, first.len))
724 goto free_and_fail1;
Pierre Habouzitb315c5c2007-09-27 12:58:23 +0200725 return strbuf_detach(&first, NULL);
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200726
727 free_and_fail1:
728 strbuf_release(&first);
729 strbuf_release(&sp);
730 return NULL;
Linus Torvalds5041aa72005-05-26 13:11:24 -0700731 }
732
Junio C Hamano22943f12005-10-14 21:54:52 -0700733 /* unquoted first name */
734 name = stop_at_slash(line, llen);
735 if (!name || name == line)
Linus Torvalds5041aa72005-05-26 13:11:24 -0700736 return NULL;
Junio C Hamano22943f12005-10-14 21:54:52 -0700737 name++;
738
Junio C Hamano81bf96b2007-11-23 02:37:03 -0800739 /*
740 * since the first name is unquoted, a dq if exists must be
Junio C Hamano22943f12005-10-14 21:54:52 -0700741 * the beginning of the second name.
742 */
743 for (second = name; second < line + llen; second++) {
744 if (*second == '"') {
Brandon Caseyf285a2d2008-10-09 14:12:12 -0500745 struct strbuf sp = STRBUF_INIT;
Junio C Hamano22943f12005-10-14 21:54:52 -0700746 const char *np;
Junio C Hamano22943f12005-10-14 21:54:52 -0700747
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200748 if (unquote_c_style(&sp, second, NULL))
749 goto free_and_fail2;
750
751 np = stop_at_slash(sp.buf, sp.len);
752 if (!np || np == sp.buf)
753 goto free_and_fail2;
Junio C Hamano22943f12005-10-14 21:54:52 -0700754 np++;
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200755
756 len = sp.buf + sp.len - np;
757 if (len < second - name &&
Junio C Hamano22943f12005-10-14 21:54:52 -0700758 !strncmp(np, name, len) &&
759 isspace(name[len])) {
760 /* Good */
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200761 strbuf_remove(&sp, 0, np - sp.buf);
Pierre Habouzitb315c5c2007-09-27 12:58:23 +0200762 return strbuf_detach(&sp, NULL);
Junio C Hamano22943f12005-10-14 21:54:52 -0700763 }
Pierre Habouzit7fb10112007-09-20 00:42:14 +0200764
765 free_and_fail2:
766 strbuf_release(&sp);
767 return NULL;
Junio C Hamano22943f12005-10-14 21:54:52 -0700768 }
769 }
770
Linus Torvalds5041aa72005-05-26 13:11:24 -0700771 /*
772 * Accept a name only if it shows up twice, exactly the same
773 * form.
774 */
775 for (len = 0 ; ; len++) {
Pierre Habouzitdd305c82006-08-23 12:39:15 +0200776 switch (name[len]) {
Linus Torvalds5041aa72005-05-26 13:11:24 -0700777 default:
778 continue;
779 case '\n':
Robert Fitzsimonse70a1652005-08-28 15:24:27 +0000780 return NULL;
Linus Torvalds5041aa72005-05-26 13:11:24 -0700781 case '\t': case ' ':
782 second = name+len;
783 for (;;) {
784 char c = *second++;
785 if (c == '\n')
786 return NULL;
787 if (c == '/')
788 break;
789 }
Linus Torvalds0e87e042005-05-26 13:28:42 -0700790 if (second[len] == '\n' && !memcmp(name, second, len)) {
Pierre Habouzit182af832007-09-16 00:32:36 +0200791 return xmemdupz(name, len);
Linus Torvalds5041aa72005-05-26 13:11:24 -0700792 }
793 }
794 }
Linus Torvalds5041aa72005-05-26 13:11:24 -0700795}
796
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700797/* Verify that we recognize the lines following a git header */
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700798static int parse_git_header(char *line, int len, unsigned int size, struct patch *patch)
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700799{
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700800 unsigned long offset;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700801
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700802 /* A git diff has explicit new/delete information, so we don't guess */
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700803 patch->is_new = 0;
804 patch->is_delete = 0;
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700805
Linus Torvalds5041aa72005-05-26 13:11:24 -0700806 /*
807 * Some things may not have the old name in the
808 * rest of the headers anywhere (pure mode changes,
809 * or removing or adding empty files), so we get
810 * the default name from the header.
811 */
Junio C Hamano22943f12005-10-14 21:54:52 -0700812 patch->def_name = git_header_name(line, len);
Jeff King969c8772008-10-12 00:06:11 -0400813 if (patch->def_name && root) {
814 char *s = xmalloc(root_len + strlen(patch->def_name) + 1);
815 strcpy(s, root);
816 strcpy(s + root_len, patch->def_name);
817 free(patch->def_name);
818 patch->def_name = s;
819 }
Linus Torvalds5041aa72005-05-26 13:11:24 -0700820
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700821 line += len;
822 size -= len;
823 linenr++;
824 for (offset = len ; size > 0 ; offset += len, size -= len, line += len, linenr++) {
825 static const struct opentry {
826 const char *str;
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700827 int (*fn)(const char *, struct patch *);
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700828 } optable[] = {
829 { "@@ -", gitdiff_hdrend },
830 { "--- ", gitdiff_oldname },
831 { "+++ ", gitdiff_newname },
832 { "old mode ", gitdiff_oldmode },
833 { "new mode ", gitdiff_newmode },
834 { "deleted file mode ", gitdiff_delete },
835 { "new file mode ", gitdiff_newfile },
836 { "copy from ", gitdiff_copysrc },
837 { "copy to ", gitdiff_copydst },
Linus Torvalds33f4d082005-06-05 14:26:50 -0700838 { "rename old ", gitdiff_renamesrc },
839 { "rename new ", gitdiff_renamedst },
Linus Torvaldsdc938412005-06-05 15:31:52 -0700840 { "rename from ", gitdiff_renamesrc },
841 { "rename to ", gitdiff_renamedst },
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700842 { "similarity index ", gitdiff_similarity },
Junio C Hamano70aadac2005-05-30 16:40:16 -0700843 { "dissimilarity index ", gitdiff_dissimilarity },
Junio C Hamano2cf67f12005-10-07 03:42:00 -0700844 { "index ", gitdiff_index },
Linus Torvalds9a4a1002005-05-23 19:13:55 -0700845 { "", gitdiff_unrecognized },
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700846 };
847 int i;
848
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700849 len = linelen(line, size);
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700850 if (!len || line[len-1] != '\n')
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700851 break;
Junio C Hamanob4f2a6a2006-03-09 11:58:05 -0800852 for (i = 0; i < ARRAY_SIZE(optable); i++) {
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700853 const struct opentry *p = optable + i;
854 int oplen = strlen(p->str);
855 if (len < oplen || memcmp(p->str, line, oplen))
856 continue;
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700857 if (p->fn(line + oplen, patch) < 0)
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700858 return offset;
Linus Torvalds9a4a1002005-05-23 19:13:55 -0700859 break;
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700860 }
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700861 }
862
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -0700863 return offset;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700864}
865
Linus Torvaldsfab2c252005-05-26 12:25:52 -0700866static int parse_num(const char *line, unsigned long *p)
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700867{
868 char *ptr;
Linus Torvaldsfab2c252005-05-26 12:25:52 -0700869
870 if (!isdigit(*line))
871 return 0;
872 *p = strtoul(line, &ptr, 10);
873 return ptr - line;
874}
875
876static int parse_range(const char *line, int len, int offset, const char *expect,
Junio C Hamano81bf96b2007-11-23 02:37:03 -0800877 unsigned long *p1, unsigned long *p2)
Linus Torvaldsfab2c252005-05-26 12:25:52 -0700878{
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700879 int digits, ex;
880
881 if (offset < 0 || offset >= len)
882 return -1;
883 line += offset;
884 len -= offset;
885
Linus Torvaldsfab2c252005-05-26 12:25:52 -0700886 digits = parse_num(line, p1);
887 if (!digits)
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700888 return -1;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700889
890 offset += digits;
891 line += digits;
892 len -= digits;
893
Linus Torvaldsc1504622006-03-25 13:28:28 -0800894 *p2 = 1;
Linus Torvaldsfab2c252005-05-26 12:25:52 -0700895 if (*line == ',') {
896 digits = parse_num(line+1, p2);
897 if (!digits)
898 return -1;
899
900 offset += digits+1;
901 line += digits+1;
902 len -= digits+1;
903 }
904
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700905 ex = strlen(expect);
906 if (ex > len)
907 return -1;
908 if (memcmp(line, expect, ex))
909 return -1;
910
911 return offset + ex;
912}
913
Johannes Schindelinc14b9d12008-06-27 18:43:09 +0100914static void recount_diff(char *line, int size, struct fragment *fragment)
915{
916 int oldlines = 0, newlines = 0, ret = 0;
917
918 if (size < 1) {
919 warning("recount: ignore empty hunk");
920 return;
921 }
922
923 for (;;) {
924 int len = linelen(line, size);
925 size -= len;
926 line += len;
927
928 if (size < 1)
929 break;
930
931 switch (*line) {
932 case ' ': case '\n':
933 newlines++;
934 /* fall through */
935 case '-':
936 oldlines++;
937 continue;
938 case '+':
939 newlines++;
940 continue;
941 case '\\':
Thomas Rast6cf91492008-07-04 21:10:14 +0200942 continue;
Johannes Schindelinc14b9d12008-06-27 18:43:09 +0100943 case '@':
944 ret = size < 3 || prefixcmp(line, "@@ ");
945 break;
946 case 'd':
947 ret = size < 5 || prefixcmp(line, "diff ");
948 break;
949 default:
950 ret = -1;
951 break;
952 }
953 if (ret) {
954 warning("recount: unexpected line: %.*s",
955 (int)linelen(line, size), line);
956 return;
957 }
958 break;
959 }
960 fragment->oldlines = oldlines;
961 fragment->newlines = newlines;
962}
963
Linus Torvaldsc1bb9352005-05-23 10:52:17 -0700964/*
Linus Torvalds46979f52005-05-23 14:38:49 -0700965 * Parse a unified diff fragment header of the
966 * form "@@ -a,b +c,d @@"
967 */
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700968static int parse_fragment_header(char *line, int len, struct fragment *fragment)
Linus Torvalds46979f52005-05-23 14:38:49 -0700969{
970 int offset;
971
972 if (!len || line[len-1] != '\n')
973 return -1;
974
975 /* Figure out the number of lines in a fragment */
Linus Torvaldsfab2c252005-05-26 12:25:52 -0700976 offset = parse_range(line, len, 4, " +", &fragment->oldpos, &fragment->oldlines);
977 offset = parse_range(line, len, offset, " @@", &fragment->newpos, &fragment->newlines);
Linus Torvalds46979f52005-05-23 14:38:49 -0700978
979 return offset;
980}
981
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700982static int find_header(char *line, unsigned long size, int *hdrsize, struct patch *patch)
Linus Torvalds46979f52005-05-23 14:38:49 -0700983{
984 unsigned long offset, len;
985
Junio C Hamano9987d7c2007-02-21 14:31:10 -0800986 patch->is_toplevel_relative = 0;
Linus Torvalds19c58fb2005-05-26 10:23:51 -0700987 patch->is_rename = patch->is_copy = 0;
988 patch->is_new = patch->is_delete = -1;
989 patch->old_mode = patch->new_mode = 0;
990 patch->old_name = patch->new_name = NULL;
Linus Torvalds46979f52005-05-23 14:38:49 -0700991 for (offset = 0; size > 0; offset += len, size -= len, line += len, linenr++) {
992 unsigned long nextlen;
993
994 len = linelen(line, size);
995 if (!len)
996 break;
997
998 /* Testing this early allows us to take a few shortcuts.. */
999 if (len < 6)
1000 continue;
1001
1002 /*
Pavel Roskin82e5a822006-07-10 01:50:18 -04001003 * Make sure we don't find any unconnected patch fragments.
Linus Torvalds46979f52005-05-23 14:38:49 -07001004 * That's a sign that we didn't find a header, and that a
1005 * patch has become corrupted/broken up.
1006 */
1007 if (!memcmp("@@ -", line, 4)) {
Linus Torvalds19c58fb2005-05-26 10:23:51 -07001008 struct fragment dummy;
1009 if (parse_fragment_header(line, len, &dummy) < 0)
Linus Torvalds46979f52005-05-23 14:38:49 -07001010 continue;
Junio C Hamano65341412007-01-09 11:50:53 -08001011 die("patch fragment without header at line %d: %.*s",
1012 linenr, (int)len-1, line);
Linus Torvalds46979f52005-05-23 14:38:49 -07001013 }
1014
1015 if (size < len + 6)
1016 break;
1017
1018 /*
1019 * Git patch? It might not have a real patch, just a rename
1020 * or mode change, so we handle that specially
1021 */
1022 if (!memcmp("diff --git ", line, 11)) {
Linus Torvalds19c58fb2005-05-26 10:23:51 -07001023 int git_hdr_len = parse_git_header(line, len, size, patch);
Linus Torvalds206de272005-06-12 09:37:49 -07001024 if (git_hdr_len <= len)
Linus Torvalds46979f52005-05-23 14:38:49 -07001025 continue;
Linus Torvaldsb7e80392005-06-17 15:23:40 -07001026 if (!patch->old_name && !patch->new_name) {
1027 if (!patch->def_name)
1028 die("git diff header lacks filename information (line %d)", linenr);
1029 patch->old_name = patch->new_name = patch->def_name;
1030 }
Junio C Hamano9987d7c2007-02-21 14:31:10 -08001031 patch->is_toplevel_relative = 1;
Linus Torvaldsa4acb0e2005-05-23 16:09:09 -07001032 *hdrsize = git_hdr_len;
Linus Torvalds46979f52005-05-23 14:38:49 -07001033 return offset;
1034 }
1035
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001036 /* --- followed by +++ ? */
Linus Torvalds46979f52005-05-23 14:38:49 -07001037 if (memcmp("--- ", line, 4) || memcmp("+++ ", line + len, 4))
1038 continue;
1039
1040 /*
1041 * We only accept unified patches, so we want it to
1042 * at least have "@@ -a,b +c,d @@\n", which is 14 chars
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001043 * minimum ("@@ -0,0 +1 @@\n" is the shortest).
Linus Torvalds46979f52005-05-23 14:38:49 -07001044 */
1045 nextlen = linelen(line + len, size - len);
1046 if (size < nextlen + 14 || memcmp("@@ -", line + len + nextlen, 4))
1047 continue;
1048
1049 /* Ok, we'll consider it a patch */
Linus Torvalds19c58fb2005-05-26 10:23:51 -07001050 parse_traditional_patch(line, line+len, patch);
Linus Torvalds46979f52005-05-23 14:38:49 -07001051 *hdrsize = len + nextlen;
1052 linenr += 2;
1053 return offset;
1054 }
1055 return -1;
1056}
1057
Junio C Hamanocf1b7862007-12-06 00:14:14 -08001058static void check_whitespace(const char *line, int len, unsigned ws_rule)
Junio C Hamanod0c25032006-09-23 00:37:19 -07001059{
Wincent Colaiutac1795bb2007-12-13 14:32:29 +01001060 char *err;
Junio C Hamano8f8841e2008-06-26 15:35:21 -07001061 unsigned result = ws_check(line + 1, len - 1, ws_rule);
Wincent Colaiutac1795bb2007-12-13 14:32:29 +01001062 if (!result)
1063 return;
Junio C Hamanod0c25032006-09-23 00:37:19 -07001064
Junio C Hamanod0c25032006-09-23 00:37:19 -07001065 whitespace_error++;
1066 if (squelch_whitespace_errors &&
1067 squelch_whitespace_errors < whitespace_error)
1068 ;
Wincent Colaiutac1795bb2007-12-13 14:32:29 +01001069 else {
1070 err = whitespace_error_string(result);
Wincent Colaiuta45e2a4b2007-12-13 14:32:30 +01001071 fprintf(stderr, "%s:%d: %s.\n%.*s\n",
Junio C Hamano8f8841e2008-06-26 15:35:21 -07001072 patch_input_file, linenr, err, len - 2, line + 1);
Wincent Colaiutac1795bb2007-12-13 14:32:29 +01001073 free(err);
1074 }
Junio C Hamanod0c25032006-09-23 00:37:19 -07001075}
1076
Linus Torvalds46979f52005-05-23 14:38:49 -07001077/*
Junio C Hamano4be60962006-09-17 01:04:24 -07001078 * Parse a unified diff. Note that this really needs to parse each
1079 * fragment separately, since the only way to know the difference
1080 * between a "---" that is part of a patch, and a "---" that starts
1081 * the next patch is to look at the line counts..
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001082 */
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001083static int parse_fragment(char *line, unsigned long size,
1084 struct patch *patch, struct fragment *fragment)
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001085{
Linus Torvalds3f403152005-05-26 11:40:43 -07001086 int added, deleted;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001087 int len = linelen(line, size), offset;
Linus Torvalds30996652005-06-05 12:43:56 -07001088 unsigned long oldlines, newlines;
Eric W. Biederman47495882006-04-10 03:33:06 -06001089 unsigned long leading, trailing;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001090
Linus Torvalds19c58fb2005-05-26 10:23:51 -07001091 offset = parse_fragment_header(line, len, fragment);
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001092 if (offset < 0)
1093 return -1;
Johannes Schindelinc14b9d12008-06-27 18:43:09 +01001094 if (offset > 0 && patch->recount)
1095 recount_diff(line + offset, size - offset, fragment);
Linus Torvalds19c58fb2005-05-26 10:23:51 -07001096 oldlines = fragment->oldlines;
1097 newlines = fragment->newlines;
Eric W. Biederman47495882006-04-10 03:33:06 -06001098 leading = 0;
1099 trailing = 0;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001100
1101 /* Parse the thing.. */
1102 line += len;
1103 size -= len;
Linus Torvalds46979f52005-05-23 14:38:49 -07001104 linenr++;
Linus Torvalds3f403152005-05-26 11:40:43 -07001105 added = deleted = 0;
Junio C Hamano4be60962006-09-17 01:04:24 -07001106 for (offset = len;
1107 0 < size;
1108 offset += len, size -= len, line += len, linenr++) {
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001109 if (!oldlines && !newlines)
1110 break;
1111 len = linelen(line, size);
1112 if (!len || line[len-1] != '\n')
1113 return -1;
1114 switch (*line) {
1115 default:
1116 return -1;
Linus Torvaldsb507b462006-10-19 19:26:08 -07001117 case '\n': /* newer GNU diff, an empty context line */
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001118 case ' ':
1119 oldlines--;
1120 newlines--;
Eric W. Biederman47495882006-04-10 03:33:06 -06001121 if (!deleted && !added)
1122 leading++;
1123 trailing++;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001124 break;
1125 case '-':
Johannes Schindelin5fda48d2007-07-07 18:50:39 +01001126 if (apply_in_reverse &&
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001127 ws_error_action != nowarn_ws_error)
Junio C Hamanocf1b7862007-12-06 00:14:14 -08001128 check_whitespace(line, len, patch->ws_rule);
Linus Torvalds3f403152005-05-26 11:40:43 -07001129 deleted++;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001130 oldlines--;
Eric W. Biederman47495882006-04-10 03:33:06 -06001131 trailing = 0;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001132 break;
1133 case '+':
Johannes Schindelin5fda48d2007-07-07 18:50:39 +01001134 if (!apply_in_reverse &&
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001135 ws_error_action != nowarn_ws_error)
Junio C Hamanocf1b7862007-12-06 00:14:14 -08001136 check_whitespace(line, len, patch->ws_rule);
Linus Torvalds3f403152005-05-26 11:40:43 -07001137 added++;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001138 newlines--;
Eric W. Biederman47495882006-04-10 03:33:06 -06001139 trailing = 0;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001140 break;
Fredrik Kuivinen433ef8a2005-09-04 19:29:02 +02001141
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001142 /*
1143 * We allow "\ No newline at end of file". Depending
Fredrik Kuivinen433ef8a2005-09-04 19:29:02 +02001144 * on locale settings when the patch was produced we
1145 * don't know what this line looks like. The only
Junio C Hamano56d33b12005-10-03 13:16:39 -07001146 * thing we do know is that it begins with "\ ".
1147 * Checking for 12 is just for sanity check -- any
1148 * l10n of "\ No newline..." is at least that long.
1149 */
Linus Torvaldsfab2c252005-05-26 12:25:52 -07001150 case '\\':
Fredrik Kuivinen433ef8a2005-09-04 19:29:02 +02001151 if (len < 12 || memcmp(line, "\\ ", 2))
Linus Torvalds3cca9282005-06-05 11:03:13 -07001152 return -1;
Linus Torvaldsfab2c252005-05-26 12:25:52 -07001153 break;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001154 }
1155 }
Linus Torvaldsc1504622006-03-25 13:28:28 -08001156 if (oldlines || newlines)
1157 return -1;
Eric W. Biederman47495882006-04-10 03:33:06 -06001158 fragment->leading = leading;
1159 fragment->trailing = trailing;
1160
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001161 /*
1162 * If a fragment ends with an incomplete line, we failed to include
Junio C Hamano8b646472005-07-22 09:56:39 -07001163 * it in the above loop because we hit oldlines == newlines == 0
1164 * before seeing it.
1165 */
Fredrik Kuivinen433ef8a2005-09-04 19:29:02 +02001166 if (12 < size && !memcmp(line, "\\ ", 2))
Junio C Hamano8b646472005-07-22 09:56:39 -07001167 offset += linelen(line, size);
1168
Linus Torvalds3f403152005-05-26 11:40:43 -07001169 patch->lines_added += added;
1170 patch->lines_deleted += deleted;
Junio C Hamano4be60962006-09-17 01:04:24 -07001171
1172 if (0 < patch->is_new && oldlines)
1173 return error("new file depends on old contents");
1174 if (0 < patch->is_delete && newlines)
1175 return error("deleted file still has contents");
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001176 return offset;
1177}
1178
Linus Torvalds19c58fb2005-05-26 10:23:51 -07001179static int parse_single_patch(char *line, unsigned long size, struct patch *patch)
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001180{
1181 unsigned long offset = 0;
Junio C Hamano4be60962006-09-17 01:04:24 -07001182 unsigned long oldlines = 0, newlines = 0, context = 0;
Linus Torvalds19c58fb2005-05-26 10:23:51 -07001183 struct fragment **fragp = &patch->fragments;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001184
1185 while (size > 4 && !memcmp(line, "@@ -", 4)) {
Linus Torvalds19c58fb2005-05-26 10:23:51 -07001186 struct fragment *fragment;
1187 int len;
1188
Peter Eriksen90321c12006-04-03 19:30:46 +01001189 fragment = xcalloc(1, sizeof(*fragment));
Linus Torvalds19c58fb2005-05-26 10:23:51 -07001190 len = parse_fragment(line, size, patch, fragment);
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001191 if (len <= 0)
Linus Torvalds46979f52005-05-23 14:38:49 -07001192 die("corrupt patch at line %d", linenr);
Linus Torvalds19c58fb2005-05-26 10:23:51 -07001193 fragment->patch = line;
1194 fragment->size = len;
Junio C Hamano4be60962006-09-17 01:04:24 -07001195 oldlines += fragment->oldlines;
1196 newlines += fragment->newlines;
1197 context += fragment->leading + fragment->trailing;
Linus Torvalds19c58fb2005-05-26 10:23:51 -07001198
1199 *fragp = fragment;
1200 fragp = &fragment->next;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001201
1202 offset += len;
1203 line += len;
1204 size -= len;
1205 }
Junio C Hamano4be60962006-09-17 01:04:24 -07001206
1207 /*
1208 * If something was removed (i.e. we have old-lines) it cannot
1209 * be creation, and if something was added it cannot be
1210 * deletion. However, the reverse is not true; --unified=0
1211 * patches that only add are not necessarily creation even
1212 * though they do not have any old lines, and ones that only
1213 * delete are not necessarily deletion.
1214 *
1215 * Unfortunately, a real creation/deletion patch do _not_ have
1216 * any context line by definition, so we cannot safely tell it
1217 * apart with --unified=0 insanity. At least if the patch has
1218 * more than one hunk it is not creation or deletion.
1219 */
1220 if (patch->is_new < 0 &&
1221 (oldlines || (patch->fragments && patch->fragments->next)))
1222 patch->is_new = 0;
1223 if (patch->is_delete < 0 &&
1224 (newlines || (patch->fragments && patch->fragments->next)))
1225 patch->is_delete = 0;
Junio C Hamano4be60962006-09-17 01:04:24 -07001226
1227 if (0 < patch->is_new && oldlines)
1228 die("new file %s depends on old contents", patch->new_name);
1229 if (0 < patch->is_delete && newlines)
1230 die("deleted file %s still has contents", patch->old_name);
1231 if (!patch->is_delete && !newlines && context)
1232 fprintf(stderr, "** warning: file %s becomes empty but "
1233 "is not deleted\n", patch->new_name);
1234
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001235 return offset;
1236}
1237
Linus Torvalds1fea6292005-09-30 23:25:23 -07001238static inline int metadata_changes(struct patch *patch)
1239{
1240 return patch->is_rename > 0 ||
1241 patch->is_copy > 0 ||
1242 patch->is_new > 0 ||
1243 patch->is_delete ||
1244 (patch->old_mode && patch->new_mode &&
1245 patch->old_mode != patch->new_mode);
1246}
1247
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001248static char *inflate_it(const void *data, unsigned long size,
1249 unsigned long inflated_size)
Junio C Hamano051308f2006-05-04 16:51:44 -07001250{
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001251 z_stream stream;
1252 void *out;
1253 int st;
1254
1255 memset(&stream, 0, sizeof(stream));
1256
1257 stream.next_in = (unsigned char *)data;
1258 stream.avail_in = size;
1259 stream.next_out = out = xmalloc(inflated_size);
1260 stream.avail_out = inflated_size;
Linus Torvalds39c68542009-01-07 19:54:47 -08001261 git_inflate_init(&stream);
1262 st = git_inflate(&stream, Z_FINISH);
1263 git_inflate_end(&stream);
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001264 if ((st != Z_STREAM_END) || stream.total_out != inflated_size) {
1265 free(out);
1266 return NULL;
1267 }
1268 return out;
1269}
1270
1271static struct fragment *parse_binary_hunk(char **buf_p,
1272 unsigned long *sz_p,
1273 int *status_p,
1274 int *used_p)
1275{
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001276 /*
1277 * Expect a line that begins with binary patch method ("literal"
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001278 * or "delta"), followed by the length of data before deflating.
1279 * a sequence of 'length-byte' followed by base-85 encoded data
1280 * should follow, terminated by a newline.
Junio C Hamano051308f2006-05-04 16:51:44 -07001281 *
1282 * Each 5-byte sequence of base-85 encodes up to 4 bytes,
1283 * and we would limit the patch line to 66 characters,
1284 * so one line can fit up to 13 groups that would decode
1285 * to 52 bytes max. The length byte 'A'-'Z' corresponds
1286 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
Junio C Hamano051308f2006-05-04 16:51:44 -07001287 */
1288 int llen, used;
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001289 unsigned long size = *sz_p;
1290 char *buffer = *buf_p;
1291 int patch_method;
1292 unsigned long origlen;
Junio C Hamano06606262006-05-05 02:41:53 -07001293 char *data = NULL;
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001294 int hunk_size = 0;
1295 struct fragment *frag;
Junio C Hamano051308f2006-05-04 16:51:44 -07001296
Junio C Hamano06606262006-05-05 02:41:53 -07001297 llen = linelen(buffer, size);
1298 used = llen;
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001299
1300 *status_p = 0;
Junio C Hamano06606262006-05-05 02:41:53 -07001301
Junio C Hamanocc44c762007-02-20 01:53:29 -08001302 if (!prefixcmp(buffer, "delta ")) {
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001303 patch_method = BINARY_DELTA_DEFLATED;
1304 origlen = strtoul(buffer + 6, NULL, 10);
Junio C Hamano06606262006-05-05 02:41:53 -07001305 }
Junio C Hamanocc44c762007-02-20 01:53:29 -08001306 else if (!prefixcmp(buffer, "literal ")) {
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001307 patch_method = BINARY_LITERAL_DEFLATED;
1308 origlen = strtoul(buffer + 8, NULL, 10);
Junio C Hamano06606262006-05-05 02:41:53 -07001309 }
1310 else
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001311 return NULL;
1312
1313 linenr++;
Junio C Hamano06606262006-05-05 02:41:53 -07001314 buffer += llen;
Junio C Hamano051308f2006-05-04 16:51:44 -07001315 while (1) {
1316 int byte_length, max_byte_length, newsize;
1317 llen = linelen(buffer, size);
1318 used += llen;
1319 linenr++;
Junio C Hamano03eb8f82006-08-16 16:07:20 -07001320 if (llen == 1) {
1321 /* consume the blank line */
1322 buffer++;
1323 size--;
Junio C Hamano051308f2006-05-04 16:51:44 -07001324 break;
Junio C Hamano03eb8f82006-08-16 16:07:20 -07001325 }
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001326 /*
1327 * Minimum line is "A00000\n" which is 7-byte long,
Junio C Hamano051308f2006-05-04 16:51:44 -07001328 * and the line length must be multiple of 5 plus 2.
1329 */
1330 if ((llen < 7) || (llen-2) % 5)
1331 goto corrupt;
1332 max_byte_length = (llen - 2) / 5 * 4;
1333 byte_length = *buffer;
1334 if ('A' <= byte_length && byte_length <= 'Z')
1335 byte_length = byte_length - 'A' + 1;
1336 else if ('a' <= byte_length && byte_length <= 'z')
1337 byte_length = byte_length - 'a' + 27;
1338 else
1339 goto corrupt;
1340 /* if the input length was not multiple of 4, we would
1341 * have filler at the end but the filler should never
1342 * exceed 3 bytes
1343 */
1344 if (max_byte_length < byte_length ||
1345 byte_length <= max_byte_length - 4)
1346 goto corrupt;
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001347 newsize = hunk_size + byte_length;
Junio C Hamano06606262006-05-05 02:41:53 -07001348 data = xrealloc(data, newsize);
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001349 if (decode_85(data + hunk_size, buffer + 1, byte_length))
Junio C Hamano051308f2006-05-04 16:51:44 -07001350 goto corrupt;
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001351 hunk_size = newsize;
Junio C Hamano051308f2006-05-04 16:51:44 -07001352 buffer += llen;
1353 size -= llen;
1354 }
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001355
1356 frag = xcalloc(1, sizeof(*frag));
1357 frag->patch = inflate_it(data, hunk_size, origlen);
1358 if (!frag->patch)
1359 goto corrupt;
1360 free(data);
1361 frag->size = origlen;
1362 *buf_p = buffer;
1363 *sz_p = size;
1364 *used_p = used;
1365 frag->binary_patch_method = patch_method;
1366 return frag;
1367
Junio C Hamano051308f2006-05-04 16:51:44 -07001368 corrupt:
Junio C Hamano4cac42b2006-08-27 21:19:39 -07001369 free(data);
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001370 *status_p = -1;
1371 error("corrupt binary patch at line %d: %.*s",
1372 linenr-1, llen-1, buffer);
1373 return NULL;
1374}
1375
1376static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
1377{
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001378 /*
1379 * We have read "GIT binary patch\n"; what follows is a line
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001380 * that says the patch method (currently, either "literal" or
1381 * "delta") and the length of data before deflating; a
1382 * sequence of 'length-byte' followed by base-85 encoded data
1383 * follows.
1384 *
1385 * When a binary patch is reversible, there is another binary
1386 * hunk in the same format, starting with patch method (either
1387 * "literal" or "delta") with the length of data, and a sequence
1388 * of length-byte + base-85 encoded data, terminated with another
1389 * empty line. This data, when applied to the postimage, produces
1390 * the preimage.
1391 */
1392 struct fragment *forward;
1393 struct fragment *reverse;
1394 int status;
1395 int used, used_1;
1396
1397 forward = parse_binary_hunk(&buffer, &size, &status, &used);
1398 if (!forward && !status)
1399 /* there has to be one hunk (forward hunk) */
1400 return error("unrecognized binary patch at line %d", linenr-1);
1401 if (status)
1402 /* otherwise we already gave an error message */
1403 return status;
1404
1405 reverse = parse_binary_hunk(&buffer, &size, &status, &used_1);
1406 if (reverse)
1407 used += used_1;
1408 else if (status) {
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001409 /*
1410 * Not having reverse hunk is not an error, but having
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07001411 * a corrupt reverse hunk is.
1412 */
1413 free((void*) forward->patch);
1414 free(forward);
1415 return status;
1416 }
1417 forward->next = reverse;
1418 patch->fragments = forward;
1419 patch->is_binary = 1;
1420 return used;
Junio C Hamano051308f2006-05-04 16:51:44 -07001421}
1422
Linus Torvalds19c58fb2005-05-26 10:23:51 -07001423static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001424{
1425 int hdrsize, patchsize;
Linus Torvalds19c58fb2005-05-26 10:23:51 -07001426 int offset = find_header(buffer, size, &hdrsize, patch);
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001427
1428 if (offset < 0)
1429 return offset;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001430
Junio C Hamanocf1b7862007-12-06 00:14:14 -08001431 patch->ws_rule = whitespace_rule(patch->new_name
1432 ? patch->new_name
1433 : patch->old_name);
1434
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001435 patchsize = parse_single_patch(buffer + offset + hdrsize,
1436 size - offset - hdrsize, patch);
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001437
Junio C Hamano92927ed2005-11-16 14:12:56 -08001438 if (!patchsize) {
Junio C Hamano3200d1a2005-11-17 20:46:29 -08001439 static const char *binhdr[] = {
1440 "Binary files ",
1441 "Files ",
1442 NULL,
1443 };
Junio C Hamano051308f2006-05-04 16:51:44 -07001444 static const char git_binary[] = "GIT binary patch\n";
Junio C Hamano3200d1a2005-11-17 20:46:29 -08001445 int i;
1446 int hd = hdrsize + offset;
1447 unsigned long llen = linelen(buffer + hd, size - hd);
Junio C Hamanoff36de02005-11-09 14:59:23 -08001448
Junio C Hamano051308f2006-05-04 16:51:44 -07001449 if (llen == sizeof(git_binary) - 1 &&
1450 !memcmp(git_binary, buffer + hd, llen)) {
1451 int used;
1452 linenr++;
1453 used = parse_binary(buffer + hd + llen,
1454 size - hd - llen, patch);
1455 if (used)
1456 patchsize = used + llen;
1457 else
1458 patchsize = 0;
1459 }
1460 else if (!memcmp(" differ\n", buffer + hd + llen - 8, 8)) {
Junio C Hamano3200d1a2005-11-17 20:46:29 -08001461 for (i = 0; binhdr[i]; i++) {
1462 int len = strlen(binhdr[i]);
1463 if (len < size - hd &&
1464 !memcmp(binhdr[i], buffer + hd, len)) {
Junio C Hamano051308f2006-05-04 16:51:44 -07001465 linenr++;
Junio C Hamano3200d1a2005-11-17 20:46:29 -08001466 patch->is_binary = 1;
Junio C Hamano051308f2006-05-04 16:51:44 -07001467 patchsize = llen;
Junio C Hamano3200d1a2005-11-17 20:46:29 -08001468 break;
1469 }
1470 }
Junio C Hamano051308f2006-05-04 16:51:44 -07001471 }
Junio C Hamanoff36de02005-11-09 14:59:23 -08001472
Junio C Hamano2b6eef92006-09-06 22:45:21 -07001473 /* Empty patch cannot be applied if it is a text patch
1474 * without metadata change. A binary patch appears
1475 * empty to us here.
Junio C Hamano92927ed2005-11-16 14:12:56 -08001476 */
1477 if ((apply || check) &&
Junio C Hamano2b6eef92006-09-06 22:45:21 -07001478 (!patch->is_binary && !metadata_changes(patch)))
Junio C Hamanoff36de02005-11-09 14:59:23 -08001479 die("patch with only garbage at line %d", linenr);
1480 }
Linus Torvalds1fea6292005-09-30 23:25:23 -07001481
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07001482 return offset + hdrsize + patchsize;
1483}
1484
Johannes Schindeline5a94312006-07-28 17:46:11 +02001485#define swap(a,b) myswap((a),(b),sizeof(a))
1486
1487#define myswap(a, b, size) do { \
1488 unsigned char mytmp[size]; \
1489 memcpy(mytmp, &a, size); \
1490 memcpy(&a, &b, size); \
1491 memcpy(&b, mytmp, size); \
1492} while (0)
1493
1494static void reverse_patches(struct patch *p)
1495{
1496 for (; p; p = p->next) {
1497 struct fragment *frag = p->fragments;
1498
1499 swap(p->new_name, p->old_name);
1500 swap(p->new_mode, p->old_mode);
1501 swap(p->is_new, p->is_delete);
1502 swap(p->lines_added, p->lines_deleted);
1503 swap(p->old_sha1_prefix, p->new_sha1_prefix);
1504
1505 for (; frag; frag = frag->next) {
1506 swap(frag->newpos, frag->oldpos);
1507 swap(frag->newlines, frag->oldlines);
1508 }
Johannes Schindeline5a94312006-07-28 17:46:11 +02001509 }
1510}
1511
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001512static const char pluses[] =
1513"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
1514static const char minuses[]=
1515"----------------------------------------------------------------------";
Linus Torvalds3f403152005-05-26 11:40:43 -07001516
1517static void show_stats(struct patch *patch)
1518{
Brandon Caseyf285a2d2008-10-09 14:12:12 -05001519 struct strbuf qname = STRBUF_INIT;
Pierre Habouzit663af342007-09-20 00:42:15 +02001520 char *cp = patch->new_name ? patch->new_name : patch->old_name;
1521 int max, add, del;
Linus Torvalds3f403152005-05-26 11:40:43 -07001522
Pierre Habouzit663af342007-09-20 00:42:15 +02001523 quote_c_style(cp, &qname, NULL, 0);
Junio C Hamano22943f12005-10-14 21:54:52 -07001524
Linus Torvalds3f403152005-05-26 11:40:43 -07001525 /*
1526 * "scale" the filename
1527 */
Linus Torvalds3f403152005-05-26 11:40:43 -07001528 max = max_len;
1529 if (max > 50)
1530 max = 50;
Pierre Habouzit663af342007-09-20 00:42:15 +02001531
1532 if (qname.len > max) {
1533 cp = strchr(qname.buf + qname.len + 3 - max, '/');
1534 if (!cp)
1535 cp = qname.buf + qname.len + 3 - max;
1536 strbuf_splice(&qname, 0, cp - qname.buf, "...", 3);
Linus Torvalds62917092005-07-28 20:37:23 -07001537 }
Pierre Habouzit663af342007-09-20 00:42:15 +02001538
1539 if (patch->is_binary) {
1540 printf(" %-*s | Bin\n", max, qname.buf);
1541 strbuf_release(&qname);
1542 return;
1543 }
1544
1545 printf(" %-*s |", max, qname.buf);
1546 strbuf_release(&qname);
Linus Torvalds3f403152005-05-26 11:40:43 -07001547
1548 /*
1549 * scale the add/delete
1550 */
Pierre Habouzit663af342007-09-20 00:42:15 +02001551 max = max + max_change > 70 ? 70 - max : max_change;
Linus Torvalds95bedc92005-05-31 20:50:49 -07001552 add = patch->lines_added;
1553 del = patch->lines_deleted;
Linus Torvalds95bedc92005-05-31 20:50:49 -07001554
Sven Verdoolaege69f956e2005-06-21 17:14:30 +02001555 if (max_change > 0) {
Pierre Habouzit663af342007-09-20 00:42:15 +02001556 int total = ((add + del) * max + max_change / 2) / max_change;
Sven Verdoolaege69f956e2005-06-21 17:14:30 +02001557 add = (add * max + max_change / 2) / max_change;
1558 del = total - add;
1559 }
Pierre Habouzit663af342007-09-20 00:42:15 +02001560 printf("%5d %.*s%.*s\n", patch->lines_added + patch->lines_deleted,
1561 add, pluses, del, minuses);
Linus Torvalds3f403152005-05-26 11:40:43 -07001562}
1563
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02001564static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
Linus Torvalds3cca9282005-06-05 11:03:13 -07001565{
Linus Torvalds3cca9282005-06-05 11:03:13 -07001566 switch (st->st_mode & S_IFMT) {
1567 case S_IFLNK:
Linus Torvaldsb11b7e12008-12-17 09:36:40 -08001568 if (strbuf_readlink(buf, path, st->st_size) < 0)
1569 return error("unable to read symlink %s", path);
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02001570 return 0;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001571 case S_IFREG:
Pierre Habouzit387e7e12007-09-27 15:25:55 +02001572 if (strbuf_read_file(buf, path, st->st_size) != st->st_size)
1573 return error("unable to open or read %s", path);
Steffen Prohaska21e5ad52008-02-06 12:25:58 +01001574 convert_to_git(path, buf->buf, buf->len, buf, 0);
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02001575 return 0;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001576 default:
1577 return -1;
1578 }
1579}
1580
Junio C Hamanoc1beba52008-01-30 15:24:34 -08001581static void update_pre_post_images(struct image *preimage,
1582 struct image *postimage,
1583 char *buf,
1584 size_t len)
Linus Torvalds3cca9282005-06-05 11:03:13 -07001585{
Junio C Hamanoc1beba52008-01-30 15:24:34 -08001586 int i, ctx;
1587 char *new, *old, *fixed;
1588 struct image fixed_preimage;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001589
Junio C Hamanoc1beba52008-01-30 15:24:34 -08001590 /*
1591 * Update the preimage with whitespace fixes. Note that we
1592 * are not losing preimage->buf -- apply_one_fragment() will
1593 * free "oldlines".
1594 */
1595 prepare_image(&fixed_preimage, buf, len, 1);
1596 assert(fixed_preimage.nr == preimage->nr);
1597 for (i = 0; i < preimage->nr; i++)
1598 fixed_preimage.line[i].flag = preimage->line[i].flag;
1599 free(preimage->line_allocated);
1600 *preimage = fixed_preimage;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001601
Junio C Hamanoc1beba52008-01-30 15:24:34 -08001602 /*
1603 * Adjust the common context lines in postimage, in place.
1604 * This is possible because whitespace fixing does not make
1605 * the string grow.
1606 */
1607 new = old = postimage->buf;
1608 fixed = preimage->buf;
1609 for (i = ctx = 0; i < postimage->nr; i++) {
1610 size_t len = postimage->line[i].len;
1611 if (!(postimage->line[i].flag & LINE_COMMON)) {
1612 /* an added line -- no counterparts in preimage */
1613 memmove(new, old, len);
1614 old += len;
1615 new += len;
1616 continue;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001617 }
Junio C Hamanoc1beba52008-01-30 15:24:34 -08001618
1619 /* a common context -- skip it in the original postimage */
1620 old += len;
1621
1622 /* and find the corresponding one in the fixed preimage */
1623 while (ctx < preimage->nr &&
1624 !(preimage->line[ctx].flag & LINE_COMMON)) {
1625 fixed += preimage->line[ctx].len;
1626 ctx++;
1627 }
1628 if (preimage->nr <= ctx)
1629 die("oops");
1630
1631 /* and copy it in, while fixing the line length */
1632 len = preimage->line[ctx].len;
1633 memcpy(new, fixed, len);
1634 new += len;
1635 fixed += len;
1636 postimage->line[i].len = len;
1637 ctx++;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001638 }
1639
Junio C Hamanoc1beba52008-01-30 15:24:34 -08001640 /* Fix the length of the whole thing */
1641 postimage->len = new - postimage->buf;
1642}
1643
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001644static int match_fragment(struct image *img,
1645 struct image *preimage,
1646 struct image *postimage,
Junio C Hamanoc89fb6b2008-01-19 00:42:22 -08001647 unsigned long try,
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001648 int try_lno,
Junio C Hamanoc607aaa2008-01-30 15:13:37 -08001649 unsigned ws_rule,
Junio C Hamanodc419762008-01-19 01:58:34 -08001650 int match_beginning, int match_end)
Junio C Hamanoc89fb6b2008-01-19 00:42:22 -08001651{
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001652 int i;
Junio C Hamanoc1beba52008-01-30 15:24:34 -08001653 char *fixed_buf, *buf, *orig, *target;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001654
1655 if (preimage->nr + try_lno > img->nr)
Junio C Hamanoc89fb6b2008-01-19 00:42:22 -08001656 return 0;
Junio C Hamanodc419762008-01-19 01:58:34 -08001657
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001658 if (match_beginning && try_lno)
1659 return 0;
1660
1661 if (match_end && preimage->nr + try_lno != img->nr)
1662 return 0;
1663
1664 /* Quick hash check */
1665 for (i = 0; i < preimage->nr; i++)
1666 if (preimage->line[i].hash != img->line[try_lno + i].hash)
1667 return 0;
1668
Junio C Hamanodc419762008-01-19 01:58:34 -08001669 /*
1670 * Do we have an exact match? If we were told to match
1671 * at the end, size must be exactly at try+fragsize,
1672 * otherwise try+fragsize must be still within the preimage,
1673 * and either case, the old piece should match the preimage
1674 * exactly.
1675 */
1676 if ((match_end
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001677 ? (try + preimage->len == img->len)
1678 : (try + preimage->len <= img->len)) &&
1679 !memcmp(img->buf + try, preimage->buf, preimage->len))
Junio C Hamanodc419762008-01-19 01:58:34 -08001680 return 1;
1681
Junio C Hamanoc1beba52008-01-30 15:24:34 -08001682 if (ws_error_action != correct_ws_error)
1683 return 0;
1684
Junio C Hamanodc419762008-01-19 01:58:34 -08001685 /*
Junio C Hamanoc1beba52008-01-30 15:24:34 -08001686 * The hunk does not apply byte-by-byte, but the hash says
1687 * it might with whitespace fuzz.
Junio C Hamanodc419762008-01-19 01:58:34 -08001688 */
Junio C Hamanoc1beba52008-01-30 15:24:34 -08001689 fixed_buf = xmalloc(preimage->len + 1);
1690 buf = fixed_buf;
1691 orig = preimage->buf;
1692 target = img->buf + try;
1693 for (i = 0; i < preimage->nr; i++) {
1694 size_t fixlen; /* length after fixing the preimage */
1695 size_t oldlen = preimage->line[i].len;
1696 size_t tgtlen = img->line[try_lno + i].len;
1697 size_t tgtfixlen; /* length after fixing the target line */
1698 char tgtfixbuf[1024], *tgtfix;
1699 int match;
1700
1701 /* Try fixing the line in the preimage */
Junio C Hamanofe3403c2008-02-23 16:59:16 -08001702 fixlen = ws_fix_copy(buf, orig, oldlen, ws_rule, NULL);
Junio C Hamanoc1beba52008-01-30 15:24:34 -08001703
1704 /* Try fixing the line in the target */
Imre Deakb8ebe082008-10-09 00:24:16 +03001705 if (sizeof(tgtfixbuf) > tgtlen)
Junio C Hamanoc1beba52008-01-30 15:24:34 -08001706 tgtfix = tgtfixbuf;
1707 else
1708 tgtfix = xmalloc(tgtlen);
Junio C Hamanofe3403c2008-02-23 16:59:16 -08001709 tgtfixlen = ws_fix_copy(tgtfix, target, tgtlen, ws_rule, NULL);
Junio C Hamanoc1beba52008-01-30 15:24:34 -08001710
1711 /*
1712 * If they match, either the preimage was based on
1713 * a version before our tree fixed whitespace breakage,
1714 * or we are lacking a whitespace-fix patch the tree
1715 * the preimage was based on already had (i.e. target
1716 * has whitespace breakage, the preimage doesn't).
1717 * In either case, we are fixing the whitespace breakages
1718 * so we might as well take the fix together with their
1719 * real change.
1720 */
1721 match = (tgtfixlen == fixlen && !memcmp(tgtfix, buf, fixlen));
1722
1723 if (tgtfix != tgtfixbuf)
1724 free(tgtfix);
1725 if (!match)
1726 goto unmatch_exit;
1727
1728 orig += oldlen;
1729 buf += fixlen;
1730 target += tgtlen;
1731 }
1732
1733 /*
1734 * Yes, the preimage is based on an older version that still
1735 * has whitespace breakages unfixed, and fixing them makes the
1736 * hunk match. Update the context lines in the postimage.
1737 */
1738 update_pre_post_images(preimage, postimage,
1739 fixed_buf, buf - fixed_buf);
1740 return 1;
1741
1742 unmatch_exit:
1743 free(fixed_buf);
Junio C Hamanodc419762008-01-19 01:58:34 -08001744 return 0;
Junio C Hamanoc89fb6b2008-01-19 00:42:22 -08001745}
1746
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001747static int find_pos(struct image *img,
1748 struct image *preimage,
1749 struct image *postimage,
1750 int line,
Junio C Hamanoc607aaa2008-01-30 15:13:37 -08001751 unsigned ws_rule,
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001752 int match_beginning, int match_end)
Linus Torvalds3cca9282005-06-05 11:03:13 -07001753{
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001754 int i;
1755 unsigned long backwards, forwards, try;
1756 int backwards_lno, forwards_lno, try_lno;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001757
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001758 if (preimage->nr > img->nr)
Linus Torvalds3cca9282005-06-05 11:03:13 -07001759 return -1;
1760
Junio C Hamanoecf4c2e2008-01-28 03:04:30 -08001761 /*
1762 * If match_begining or match_end is specified, there is no
1763 * point starting from a wrong line that will never match and
1764 * wander around and wait for a match at the specified end.
1765 */
1766 if (match_beginning)
1767 line = 0;
1768 else if (match_end)
1769 line = img->nr - preimage->nr;
1770
Junio C Hamano52f3c812008-02-11 15:32:29 -08001771 if (line > img->nr)
1772 line = img->nr;
1773
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001774 try = 0;
1775 for (i = 0; i < line; i++)
1776 try += img->line[i].len;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001777
1778 /*
Linus Torvalds6e7c92a2005-06-05 12:16:32 -07001779 * There's probably some smart way to do this, but I'll leave
1780 * that to the smart and beautiful people. I'm simple and stupid.
1781 */
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001782 backwards = try;
1783 backwards_lno = line;
1784 forwards = try;
1785 forwards_lno = line;
1786 try_lno = line;
Linus Torvalds6e7c92a2005-06-05 12:16:32 -07001787
Junio C Hamanofcb77bc2008-01-19 02:16:16 -08001788 for (i = 0; ; i++) {
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001789 if (match_fragment(img, preimage, postimage,
Junio C Hamanoc607aaa2008-01-30 15:13:37 -08001790 try, try_lno, ws_rule,
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001791 match_beginning, match_end))
1792 return try_lno;
Junio C Hamanofcb77bc2008-01-19 02:16:16 -08001793
1794 again:
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001795 if (backwards_lno == 0 && forwards_lno == img->nr)
Junio C Hamanofcb77bc2008-01-19 02:16:16 -08001796 break;
1797
Linus Torvalds6e7c92a2005-06-05 12:16:32 -07001798 if (i & 1) {
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001799 if (backwards_lno == 0) {
Junio C Hamanofcb77bc2008-01-19 02:16:16 -08001800 i++;
1801 goto again;
Linus Torvalds6e7c92a2005-06-05 12:16:32 -07001802 }
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001803 backwards_lno--;
1804 backwards -= img->line[backwards_lno].len;
Linus Torvalds6e7c92a2005-06-05 12:16:32 -07001805 try = backwards;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001806 try_lno = backwards_lno;
Linus Torvalds6e7c92a2005-06-05 12:16:32 -07001807 } else {
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001808 if (forwards_lno == img->nr) {
Junio C Hamanofcb77bc2008-01-19 02:16:16 -08001809 i++;
1810 goto again;
Linus Torvalds6e7c92a2005-06-05 12:16:32 -07001811 }
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001812 forwards += img->line[forwards_lno].len;
1813 forwards_lno++;
Linus Torvalds6e7c92a2005-06-05 12:16:32 -07001814 try = forwards;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001815 try_lno = forwards_lno;
Linus Torvalds6e7c92a2005-06-05 12:16:32 -07001816 }
1817
Linus Torvalds6e7c92a2005-06-05 12:16:32 -07001818 }
Linus Torvalds3cca9282005-06-05 11:03:13 -07001819 return -1;
1820}
1821
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001822static void remove_first_line(struct image *img)
Eric W. Biederman47495882006-04-10 03:33:06 -06001823{
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001824 img->buf += img->line[0].len;
1825 img->len -= img->line[0].len;
1826 img->line++;
1827 img->nr--;
Eric W. Biederman47495882006-04-10 03:33:06 -06001828}
1829
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001830static void remove_last_line(struct image *img)
Eric W. Biederman47495882006-04-10 03:33:06 -06001831{
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001832 img->len -= img->line[--img->nr].len;
Eric W. Biederman47495882006-04-10 03:33:06 -06001833}
1834
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001835static void update_image(struct image *img,
1836 int applied_pos,
1837 struct image *preimage,
1838 struct image *postimage)
Junio C Hamanob5767dd2006-02-26 18:13:25 -08001839{
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001840 /*
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001841 * remove the copy of preimage at offset in img
1842 * and replace it with postimage
Junio C Hamanob5767dd2006-02-26 18:13:25 -08001843 */
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001844 int i, nr;
1845 size_t remove_count, insert_count, applied_at = 0;
1846 char *result;
Junio C Hamanod0c25032006-09-23 00:37:19 -07001847
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001848 for (i = 0; i < applied_pos; i++)
1849 applied_at += img->line[i].len;
Junio C Hamanod0c25032006-09-23 00:37:19 -07001850
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001851 remove_count = 0;
1852 for (i = 0; i < preimage->nr; i++)
1853 remove_count += img->line[applied_pos + i].len;
1854 insert_count = postimage->len;
Junio C Hamanod0c25032006-09-23 00:37:19 -07001855
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001856 /* Adjust the contents */
1857 result = xmalloc(img->len + insert_count - remove_count + 1);
1858 memcpy(result, img->buf, applied_at);
1859 memcpy(result + applied_at, postimage->buf, postimage->len);
1860 memcpy(result + applied_at + postimage->len,
1861 img->buf + (applied_at + remove_count),
1862 img->len - (applied_at + remove_count));
1863 free(img->buf);
1864 img->buf = result;
1865 img->len += insert_count - remove_count;
1866 result[img->len] = '\0';
Junio C Hamanod0c25032006-09-23 00:37:19 -07001867
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001868 /* Adjust the line table */
1869 nr = img->nr + postimage->nr - preimage->nr;
1870 if (preimage->nr < postimage->nr) {
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001871 /*
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001872 * NOTE: this knows that we never call remove_first_line()
1873 * on anything other than pre/post image.
Junio C Hamanod0c25032006-09-23 00:37:19 -07001874 */
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001875 img->line = xrealloc(img->line, nr * sizeof(*img->line));
1876 img->line_allocated = img->line;
Junio C Hamanod0c25032006-09-23 00:37:19 -07001877 }
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001878 if (preimage->nr != postimage->nr)
1879 memmove(img->line + applied_pos + postimage->nr,
1880 img->line + applied_pos + preimage->nr,
1881 (img->nr - (applied_pos + preimage->nr)) *
1882 sizeof(*img->line));
1883 memcpy(img->line + applied_pos,
1884 postimage->line,
1885 postimage->nr * sizeof(*img->line));
1886 img->nr = nr;
Junio C Hamanob5767dd2006-02-26 18:13:25 -08001887}
1888
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001889static int apply_one_fragment(struct image *img, struct fragment *frag,
Junio C Hamanocf1b7862007-12-06 00:14:14 -08001890 int inaccurate_eof, unsigned ws_rule)
Linus Torvalds3cca9282005-06-05 11:03:13 -07001891{
Junio C Hamano65aadb92006-05-24 13:19:50 -07001892 int match_beginning, match_end;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001893 const char *patch = frag->patch;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001894 int size = frag->size;
Junio C Hamano61e08cc2008-01-30 13:12:25 -08001895 char *old, *new, *oldlines, *newlines;
Junio C Hamano077e1af2007-05-20 23:51:06 -07001896 int new_blank_lines_at_end = 0;
Eric W. Biederman47495882006-04-10 03:33:06 -06001897 unsigned long leading, trailing;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08001898 int pos, applied_pos;
1899 struct image preimage;
1900 struct image postimage;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001901
Junio C Hamanoc330fdd2008-01-29 00:17:55 -08001902 memset(&preimage, 0, sizeof(preimage));
1903 memset(&postimage, 0, sizeof(postimage));
Junio C Hamano61e08cc2008-01-30 13:12:25 -08001904 oldlines = xmalloc(size);
1905 newlines = xmalloc(size);
Junio C Hamanoc330fdd2008-01-29 00:17:55 -08001906
Junio C Hamano61e08cc2008-01-30 13:12:25 -08001907 old = oldlines;
1908 new = newlines;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001909 while (size > 0) {
Johannes Schindeline5a94312006-07-28 17:46:11 +02001910 char first;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001911 int len = linelen(patch, size);
Junio C Hamano8441a9a2008-01-30 13:19:58 -08001912 int plen, added;
Junio C Hamano077e1af2007-05-20 23:51:06 -07001913 int added_blank_line = 0;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001914
1915 if (!len)
1916 break;
1917
1918 /*
1919 * "plen" is how much of the line we should use for
1920 * the actual patch data. Normally we just remove the
1921 * first character on the line, but if the line is
1922 * followed by "\ No newline", then we also remove the
1923 * last one (which is the newline, of course).
1924 */
Junio C Hamano61e08cc2008-01-30 13:12:25 -08001925 plen = len - 1;
Junio C Hamano8b646472005-07-22 09:56:39 -07001926 if (len < size && patch[len] == '\\')
Linus Torvalds3cca9282005-06-05 11:03:13 -07001927 plen--;
Johannes Schindeline5a94312006-07-28 17:46:11 +02001928 first = *patch;
Junio C Hamanof686d032006-08-14 23:26:51 -07001929 if (apply_in_reverse) {
Johannes Schindeline5a94312006-07-28 17:46:11 +02001930 if (first == '-')
1931 first = '+';
1932 else if (first == '+')
1933 first = '-';
1934 }
Marco Costalbaefe7f352007-05-20 14:45:59 +02001935
Johannes Schindeline5a94312006-07-28 17:46:11 +02001936 switch (first) {
Linus Torvaldsb507b462006-10-19 19:26:08 -07001937 case '\n':
1938 /* Newer GNU diff, empty context line */
1939 if (plen < 0)
1940 /* ... followed by '\No newline'; nothing */
1941 break;
Junio C Hamano61e08cc2008-01-30 13:12:25 -08001942 *old++ = '\n';
1943 *new++ = '\n';
Junio C Hamanoc330fdd2008-01-29 00:17:55 -08001944 add_line_info(&preimage, "\n", 1, LINE_COMMON);
1945 add_line_info(&postimage, "\n", 1, LINE_COMMON);
Linus Torvaldsb507b462006-10-19 19:26:08 -07001946 break;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001947 case ' ':
1948 case '-':
Junio C Hamano61e08cc2008-01-30 13:12:25 -08001949 memcpy(old, patch + 1, plen);
1950 add_line_info(&preimage, old, plen,
Junio C Hamanoc330fdd2008-01-29 00:17:55 -08001951 (first == ' ' ? LINE_COMMON : 0));
Junio C Hamano61e08cc2008-01-30 13:12:25 -08001952 old += plen;
Johannes Schindeline5a94312006-07-28 17:46:11 +02001953 if (first == '-')
Linus Torvalds3cca9282005-06-05 11:03:13 -07001954 break;
1955 /* Fall-through for ' ' */
1956 case '+':
Junio C Hamano8441a9a2008-01-30 13:19:58 -08001957 /* --no-add does not add new lines */
1958 if (first == '+' && no_add)
1959 break;
Junio C Hamanoc330fdd2008-01-29 00:17:55 -08001960
Junio C Hamano8441a9a2008-01-30 13:19:58 -08001961 if (first != '+' ||
1962 !whitespace_error ||
1963 ws_error_action != correct_ws_error) {
1964 memcpy(new, patch + 1, plen);
1965 added = plen;
Junio C Hamano077e1af2007-05-20 23:51:06 -07001966 }
Junio C Hamano8441a9a2008-01-30 13:19:58 -08001967 else {
Junio C Hamanofe3403c2008-02-23 16:59:16 -08001968 added = ws_fix_copy(new, patch + 1, plen, ws_rule, &applied_after_fixing_ws);
Junio C Hamano8441a9a2008-01-30 13:19:58 -08001969 }
1970 add_line_info(&postimage, new, added,
1971 (first == '+' ? 0 : LINE_COMMON));
1972 new += added;
1973 if (first == '+' &&
1974 added == 1 && new[-1] == '\n')
1975 added_blank_line = 1;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001976 break;
1977 case '@': case '\\':
1978 /* Ignore it, we already handled it */
1979 break;
1980 default:
Johannes Schindelinaeabfa02007-02-22 20:11:21 +01001981 if (apply_verbosely)
1982 error("invalid start of line: '%c'", first);
Linus Torvalds3cca9282005-06-05 11:03:13 -07001983 return -1;
1984 }
Junio C Hamano077e1af2007-05-20 23:51:06 -07001985 if (added_blank_line)
1986 new_blank_lines_at_end++;
1987 else
1988 new_blank_lines_at_end = 0;
Linus Torvalds3cca9282005-06-05 11:03:13 -07001989 patch += len;
1990 size -= len;
1991 }
Junio C Hamano81bf96b2007-11-23 02:37:03 -08001992 if (inaccurate_eof &&
Junio C Hamano61e08cc2008-01-30 13:12:25 -08001993 old > oldlines && old[-1] == '\n' &&
1994 new > newlines && new[-1] == '\n') {
1995 old--;
1996 new--;
Johannes Schindelin5b5d4d92006-02-17 15:23:16 +01001997 }
Linus Torvalds6e7c92a2005-06-05 12:16:32 -07001998
Eric W. Biederman47495882006-04-10 03:33:06 -06001999 leading = frag->leading;
2000 trailing = frag->trailing;
Linus Torvalds1bf1a852006-05-23 19:08:01 -07002001
2002 /*
Junio C Hamanoee5a3172008-04-06 19:21:45 -07002003 * A hunk to change lines at the beginning would begin with
2004 * @@ -1,L +N,M @@
Junio C Hamanoed0f47a2008-08-30 13:20:31 -07002005 * but we need to be careful. -U0 that inserts before the second
2006 * line also has this pattern.
Junio C Hamano4be60962006-09-17 01:04:24 -07002007 *
Junio C Hamanoee5a3172008-04-06 19:21:45 -07002008 * And a hunk to add to an empty file would begin with
2009 * @@ -0,0 +N,M @@
2010 *
2011 * In other words, a hunk that is (frag->oldpos <= 1) with or
2012 * without leading context must match at the beginning.
Linus Torvalds1bf1a852006-05-23 19:08:01 -07002013 */
Junio C Hamanoed0f47a2008-08-30 13:20:31 -07002014 match_beginning = (!frag->oldpos ||
2015 (frag->oldpos == 1 && !unidiff_zero));
Junio C Hamanoee5a3172008-04-06 19:21:45 -07002016
2017 /*
2018 * A hunk without trailing lines must match at the end.
2019 * However, we simply cannot tell if a hunk must match end
2020 * from the lack of trailing lines if the patch was generated
2021 * with unidiff without any context.
2022 */
2023 match_end = !unidiff_zero && !trailing;
Linus Torvalds1bf1a852006-05-23 19:08:01 -07002024
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002025 pos = frag->newpos ? (frag->newpos - 1) : 0;
Junio C Hamano61e08cc2008-01-30 13:12:25 -08002026 preimage.buf = oldlines;
2027 preimage.len = old - oldlines;
2028 postimage.buf = newlines;
2029 postimage.len = new - newlines;
Junio C Hamanoc330fdd2008-01-29 00:17:55 -08002030 preimage.line = preimage.line_allocated;
2031 postimage.line = postimage.line_allocated;
2032
Eric W. Biederman47495882006-04-10 03:33:06 -06002033 for (;;) {
Marco Costalbaefe7f352007-05-20 14:45:59 +02002034
Junio C Hamanoc607aaa2008-01-30 15:13:37 -08002035 applied_pos = find_pos(img, &preimage, &postimage, pos,
2036 ws_rule, match_beginning, match_end);
Eric W. Biederman47495882006-04-10 03:33:06 -06002037
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002038 if (applied_pos >= 0)
Eric W. Biederman47495882006-04-10 03:33:06 -06002039 break;
Eric W. Biederman47495882006-04-10 03:33:06 -06002040
2041 /* Am I at my context limits? */
2042 if ((leading <= p_context) && (trailing <= p_context))
2043 break;
Junio C Hamano65aadb92006-05-24 13:19:50 -07002044 if (match_beginning || match_end) {
2045 match_beginning = match_end = 0;
Linus Torvalds1bf1a852006-05-23 19:08:01 -07002046 continue;
2047 }
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002048
Junio C Hamano81bf96b2007-11-23 02:37:03 -08002049 /*
2050 * Reduce the number of context lines; reduce both
2051 * leading and trailing if they are equal otherwise
2052 * just reduce the larger context.
Eric W. Biederman47495882006-04-10 03:33:06 -06002053 */
2054 if (leading >= trailing) {
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002055 remove_first_line(&preimage);
2056 remove_first_line(&postimage);
Eric W. Biederman47495882006-04-10 03:33:06 -06002057 pos--;
2058 leading--;
2059 }
2060 if (trailing > leading) {
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002061 remove_last_line(&preimage);
2062 remove_last_line(&postimage);
Eric W. Biederman47495882006-04-10 03:33:06 -06002063 trailing--;
2064 }
Linus Torvalds3cca9282005-06-05 11:03:13 -07002065 }
2066
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002067 if (applied_pos >= 0) {
2068 if (ws_error_action == correct_ws_error &&
2069 new_blank_lines_at_end &&
2070 postimage.nr + applied_pos == img->nr) {
2071 /*
2072 * If the patch application adds blank lines
2073 * at the end, and if the patch applies at the
2074 * end of the image, remove those added blank
2075 * lines.
2076 */
2077 while (new_blank_lines_at_end--)
2078 remove_last_line(&postimage);
2079 }
Johannes Schindelinaeabfa02007-02-22 20:11:21 +01002080
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002081 /*
2082 * Warn if it was necessary to reduce the number
2083 * of context lines.
2084 */
2085 if ((leading != frag->leading) ||
2086 (trailing != frag->trailing))
2087 fprintf(stderr, "Context reduced to (%ld/%ld)"
2088 " to apply fragment at %d\n",
2089 leading, trailing, applied_pos+1);
2090 update_image(img, applied_pos, &preimage, &postimage);
2091 } else {
2092 if (apply_verbosely)
Junio C Hamano61e08cc2008-01-30 13:12:25 -08002093 error("while searching for:\n%.*s",
2094 (int)(old - oldlines), oldlines);
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002095 }
Linus Torvalds3cca9282005-06-05 11:03:13 -07002096
Junio C Hamano61e08cc2008-01-30 13:12:25 -08002097 free(oldlines);
2098 free(newlines);
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002099 free(preimage.line_allocated);
2100 free(postimage.line_allocated);
2101
2102 return (applied_pos < 0);
Linus Torvalds3cca9282005-06-05 11:03:13 -07002103}
2104
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002105static int apply_binary_fragment(struct image *img, struct patch *patch)
Junio C Hamano06606262006-05-05 02:41:53 -07002106{
Junio C Hamano06606262006-05-05 02:41:53 -07002107 struct fragment *fragment = patch->fragments;
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002108 unsigned long len;
2109 void *dst;
Junio C Hamano06606262006-05-05 02:41:53 -07002110
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07002111 /* Binary patch is irreversible without the optional second hunk */
2112 if (apply_in_reverse) {
2113 if (!fragment->next)
2114 return error("cannot reverse-apply a binary patch "
2115 "without the reverse hunk to '%s'",
2116 patch->new_name
2117 ? patch->new_name : patch->old_name);
Junio C Hamano03eb8f82006-08-16 16:07:20 -07002118 fragment = fragment->next;
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07002119 }
Junio C Hamano3cd4f5e2006-08-15 02:23:06 -07002120 switch (fragment->binary_patch_method) {
Junio C Hamano06606262006-05-05 02:41:53 -07002121 case BINARY_DELTA_DEFLATED:
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002122 dst = patch_delta(img->buf, img->len, fragment->patch,
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002123 fragment->size, &len);
2124 if (!dst)
2125 return -1;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002126 clear_image(img);
2127 img->buf = dst;
2128 img->len = len;
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002129 return 0;
Junio C Hamano06606262006-05-05 02:41:53 -07002130 case BINARY_LITERAL_DEFLATED:
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002131 clear_image(img);
2132 img->len = fragment->size;
2133 img->buf = xmalloc(img->len+1);
2134 memcpy(img->buf, fragment->patch, img->len);
2135 img->buf[img->len] = '\0';
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002136 return 0;
Junio C Hamano06606262006-05-05 02:41:53 -07002137 }
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002138 return -1;
Junio C Hamano06606262006-05-05 02:41:53 -07002139}
2140
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002141static int apply_binary(struct image *img, struct patch *patch)
Junio C Hamano051308f2006-05-04 16:51:44 -07002142{
2143 const char *name = patch->old_name ? patch->old_name : patch->new_name;
2144 unsigned char sha1[20];
Junio C Hamano051308f2006-05-04 16:51:44 -07002145
Junio C Hamano81bf96b2007-11-23 02:37:03 -08002146 /*
2147 * For safety, we require patch index line to contain
Junio C Hamano051308f2006-05-04 16:51:44 -07002148 * full 40-byte textual SHA1 for old and new, at least for now.
2149 */
2150 if (strlen(patch->old_sha1_prefix) != 40 ||
2151 strlen(patch->new_sha1_prefix) != 40 ||
2152 get_sha1_hex(patch->old_sha1_prefix, sha1) ||
2153 get_sha1_hex(patch->new_sha1_prefix, sha1))
2154 return error("cannot apply binary patch to '%s' "
2155 "without full index line", name);
2156
2157 if (patch->old_name) {
Junio C Hamano81bf96b2007-11-23 02:37:03 -08002158 /*
2159 * See if the old one matches what the patch
Junio C Hamano051308f2006-05-04 16:51:44 -07002160 * applies to.
2161 */
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002162 hash_sha1_file(img->buf, img->len, blob_type, sha1);
Junio C Hamano051308f2006-05-04 16:51:44 -07002163 if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix))
2164 return error("the patch applies to '%s' (%s), "
2165 "which does not match the "
2166 "current contents.",
2167 name, sha1_to_hex(sha1));
2168 }
2169 else {
2170 /* Otherwise, the old one must be empty. */
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002171 if (img->len)
Junio C Hamano051308f2006-05-04 16:51:44 -07002172 return error("the patch applies to an empty "
2173 "'%s' but it is not empty", name);
2174 }
2175
Junio C Hamano06606262006-05-05 02:41:53 -07002176 get_sha1_hex(patch->new_sha1_prefix, sha1);
David Rientjes0bef57e2006-08-15 13:37:19 -07002177 if (is_null_sha1(sha1)) {
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002178 clear_image(img);
Junio C Hamano051308f2006-05-04 16:51:44 -07002179 return 0; /* deletion patch */
Junio C Hamano06606262006-05-05 02:41:53 -07002180 }
Junio C Hamano051308f2006-05-04 16:51:44 -07002181
2182 if (has_sha1_file(sha1)) {
Junio C Hamano06606262006-05-05 02:41:53 -07002183 /* We already have the postimage */
Nicolas Pitre21666f12007-02-26 14:55:59 -05002184 enum object_type type;
Junio C Hamano051308f2006-05-04 16:51:44 -07002185 unsigned long size;
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002186 char *result;
Junio C Hamano051308f2006-05-04 16:51:44 -07002187
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002188 result = read_sha1_file(sha1, &type, &size);
2189 if (!result)
Junio C Hamano051308f2006-05-04 16:51:44 -07002190 return error("the necessary postimage %s for "
2191 "'%s' cannot be read",
2192 patch->new_sha1_prefix, name);
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002193 clear_image(img);
2194 img->buf = result;
2195 img->len = size;
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002196 } else {
Junio C Hamano81bf96b2007-11-23 02:37:03 -08002197 /*
2198 * We have verified buf matches the preimage;
Junio C Hamano06606262006-05-05 02:41:53 -07002199 * apply the patch data to it, which is stored
2200 * in the patch->fragments->{patch,size}.
Junio C Hamano051308f2006-05-04 16:51:44 -07002201 */
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002202 if (apply_binary_fragment(img, patch))
Junio C Hamano051308f2006-05-04 16:51:44 -07002203 return error("binary patch does not apply to '%s'",
2204 name);
Junio C Hamano051308f2006-05-04 16:51:44 -07002205
2206 /* verify that the result matches */
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002207 hash_sha1_file(img->buf, img->len, blob_type, sha1);
Junio C Hamano051308f2006-05-04 16:51:44 -07002208 if (strcmp(sha1_to_hex(sha1), patch->new_sha1_prefix))
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002209 return error("binary patch to '%s' creates incorrect result (expecting %s, got %s)",
2210 name, patch->new_sha1_prefix, sha1_to_hex(sha1));
Junio C Hamano051308f2006-05-04 16:51:44 -07002211 }
2212
2213 return 0;
2214}
2215
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002216static int apply_fragments(struct image *img, struct patch *patch)
Linus Torvalds3cca9282005-06-05 11:03:13 -07002217{
2218 struct fragment *frag = patch->fragments;
Junio C Hamano011f4272005-11-14 17:37:05 -08002219 const char *name = patch->old_name ? patch->old_name : patch->new_name;
Junio C Hamanocf1b7862007-12-06 00:14:14 -08002220 unsigned ws_rule = patch->ws_rule;
2221 unsigned inaccurate_eof = patch->inaccurate_eof;
Junio C Hamano011f4272005-11-14 17:37:05 -08002222
Junio C Hamano051308f2006-05-04 16:51:44 -07002223 if (patch->is_binary)
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002224 return apply_binary(img, patch);
Linus Torvalds3cca9282005-06-05 11:03:13 -07002225
2226 while (frag) {
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002227 if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule)) {
Junio C Hamano57dc3972006-08-16 17:55:29 -07002228 error("patch failed: %s:%ld", name, frag->oldpos);
2229 if (!apply_with_reject)
2230 return -1;
2231 frag->rejected = 1;
2232 }
Linus Torvalds3cca9282005-06-05 11:03:13 -07002233 frag = frag->next;
2234 }
Linus Torvalds30996652005-06-05 12:43:56 -07002235 return 0;
Linus Torvalds3cca9282005-06-05 11:03:13 -07002236}
2237
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002238static int read_file_or_gitlink(struct cache_entry *ce, struct strbuf *buf)
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002239{
2240 if (!ce)
2241 return 0;
2242
Linus Torvalds7a51ed62008-01-14 16:03:17 -08002243 if (S_ISGITLINK(ce->ce_mode)) {
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002244 strbuf_grow(buf, 100);
2245 strbuf_addf(buf, "Subproject commit %s\n", sha1_to_hex(ce->sha1));
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002246 } else {
2247 enum object_type type;
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002248 unsigned long sz;
2249 char *result;
2250
2251 result = read_sha1_file(ce->sha1, &type, &sz);
2252 if (!result)
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002253 return -1;
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002254 /* XXX read_sha1_file NUL-terminates */
2255 strbuf_attach(buf, result, sz, sz + 1);
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002256 }
2257 return 0;
2258}
2259
Don Zickus7a078412008-06-27 14:39:12 -04002260static struct patch *in_fn_table(const char *name)
2261{
Johannes Schindelinc455c872008-07-21 19:03:49 +01002262 struct string_list_item *item;
Don Zickus7a078412008-06-27 14:39:12 -04002263
2264 if (name == NULL)
2265 return NULL;
2266
Johannes Schindelinc455c872008-07-21 19:03:49 +01002267 item = string_list_lookup(name, &fn_table);
Don Zickus7a078412008-06-27 14:39:12 -04002268 if (item != NULL)
2269 return (struct patch *)item->util;
2270
2271 return NULL;
2272}
2273
Michał Kiedrowicz7fac0ee2009-04-11 21:31:00 +02002274/*
2275 * item->util in the filename table records the status of the path.
2276 * Usually it points at a patch (whose result records the contents
2277 * of it after applying it), but it could be PATH_WAS_DELETED for a
2278 * path that a previously applied patch has already removed.
2279 */
2280 #define PATH_TO_BE_DELETED ((struct patch *) -2)
2281#define PATH_WAS_DELETED ((struct patch *) -1)
2282
2283static int to_be_deleted(struct patch *patch)
2284{
2285 return patch == PATH_TO_BE_DELETED;
2286}
2287
2288static int was_deleted(struct patch *patch)
2289{
2290 return patch == PATH_WAS_DELETED;
2291}
2292
Don Zickus7a078412008-06-27 14:39:12 -04002293static void add_to_fn_table(struct patch *patch)
2294{
Johannes Schindelinc455c872008-07-21 19:03:49 +01002295 struct string_list_item *item;
Don Zickus7a078412008-06-27 14:39:12 -04002296
2297 /*
2298 * Always add new_name unless patch is a deletion
2299 * This should cover the cases for normal diffs,
2300 * file creations and copies
2301 */
2302 if (patch->new_name != NULL) {
Johannes Schindelinc455c872008-07-21 19:03:49 +01002303 item = string_list_insert(patch->new_name, &fn_table);
Don Zickus7a078412008-06-27 14:39:12 -04002304 item->util = patch;
2305 }
2306
2307 /*
2308 * store a failure on rename/deletion cases because
2309 * later chunks shouldn't patch old names
2310 */
2311 if ((patch->new_name == NULL) || (patch->is_rename)) {
Johannes Schindelinc455c872008-07-21 19:03:49 +01002312 item = string_list_insert(patch->old_name, &fn_table);
Michał Kiedrowicz7fac0ee2009-04-11 21:31:00 +02002313 item->util = PATH_WAS_DELETED;
2314 }
2315}
2316
2317static void prepare_fn_table(struct patch *patch)
2318{
2319 /*
2320 * store information about incoming file deletion
2321 */
2322 while (patch) {
2323 if ((patch->new_name == NULL) || (patch->is_rename)) {
2324 struct string_list_item *item;
2325 item = string_list_insert(patch->old_name, &fn_table);
2326 item->util = PATH_TO_BE_DELETED;
2327 }
2328 patch = patch->next;
Don Zickus7a078412008-06-27 14:39:12 -04002329 }
2330}
2331
Junio C Hamano04e48882006-05-15 15:15:47 -07002332static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *ce)
Linus Torvalds3cca9282005-06-05 11:03:13 -07002333{
Brandon Caseyf285a2d2008-10-09 14:12:12 -05002334 struct strbuf buf = STRBUF_INIT;
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002335 struct image image;
2336 size_t len;
2337 char *img;
Don Zickus7a078412008-06-27 14:39:12 -04002338 struct patch *tpatch;
Linus Torvalds3cca9282005-06-05 11:03:13 -07002339
Junio C Hamanoa9a3e822008-07-09 19:58:23 -07002340 if (!(patch->is_copy || patch->is_rename) &&
Michał Kiedrowicz7fac0ee2009-04-11 21:31:00 +02002341 (tpatch = in_fn_table(patch->old_name)) != NULL && !to_be_deleted(tpatch)) {
2342 if (was_deleted(tpatch)) {
Don Zickus7a078412008-06-27 14:39:12 -04002343 return error("patch %s has been renamed/deleted",
2344 patch->old_name);
2345 }
2346 /* We have a patched copy in memory use that */
2347 strbuf_add(&buf, tpatch->result, tpatch->resultsize);
2348 } else if (cached) {
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002349 if (read_file_or_gitlink(ce, &buf))
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002350 return error("read of %s failed", patch->old_name);
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002351 } else if (patch->old_name) {
2352 if (S_ISGITLINK(patch->old_mode)) {
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002353 if (ce) {
2354 read_file_or_gitlink(ce, &buf);
2355 } else {
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002356 /*
2357 * There is no way to apply subproject
2358 * patch without looking at the index.
2359 */
2360 patch->fragments = NULL;
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002361 }
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002362 } else {
2363 if (read_old_data(st, patch->old_name, &buf))
2364 return error("read of %s failed", patch->old_name);
Junio C Hamano04e48882006-05-15 15:15:47 -07002365 }
2366 }
Linus Torvalds6e7c92a2005-06-05 12:16:32 -07002367
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002368 img = strbuf_detach(&buf, &len);
2369 prepare_image(&image, img, len, !patch->is_binary);
2370
2371 if (apply_fragments(&image, patch) < 0)
Junio C Hamano57dc3972006-08-16 17:55:29 -07002372 return -1; /* note with --reject this succeeds. */
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002373 patch->result = image.buf;
2374 patch->resultsize = image.len;
Don Zickus7a078412008-06-27 14:39:12 -04002375 add_to_fn_table(patch);
Junio C Hamanob94f2ed2008-01-26 17:42:49 -08002376 free(image.line_allocated);
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002377
Junio C Hamano4be60962006-09-17 01:04:24 -07002378 if (0 < patch->is_delete && patch->resultsize)
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002379 return error("removal patch leaves file contents");
2380
Linus Torvalds3cca9282005-06-05 11:03:13 -07002381 return 0;
2382}
2383
Junio C Hamano64cab592007-05-11 22:26:08 -07002384static int check_to_create_blob(const char *new_name, int ok_if_exists)
2385{
2386 struct stat nst;
2387 if (!lstat(new_name, &nst)) {
2388 if (S_ISDIR(nst.st_mode) || ok_if_exists)
2389 return 0;
2390 /*
2391 * A leading component of new_name might be a symlink
2392 * that is going to be removed with this patch, but
2393 * still pointing at somewhere that has the path.
2394 * In such a case, path "new_name" does not exist as
2395 * far as git is concerned.
2396 */
Kjetil Barvik57199892009-02-09 21:54:06 +01002397 if (has_symlink_leading_path(new_name, strlen(new_name)))
Junio C Hamano64cab592007-05-11 22:26:08 -07002398 return 0;
2399
2400 return error("%s: already exists in working directory", new_name);
2401 }
2402 else if ((errno != ENOENT) && (errno != ENOTDIR))
2403 return error("%s: %s", new_name, strerror(errno));
2404 return 0;
2405}
2406
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002407static int verify_index_match(struct cache_entry *ce, struct stat *st)
2408{
Linus Torvalds7a51ed62008-01-14 16:03:17 -08002409 if (S_ISGITLINK(ce->ce_mode)) {
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002410 if (!S_ISDIR(st->st_mode))
2411 return -1;
2412 return 0;
2413 }
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08002414 return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID);
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002415}
2416
Junio C Hamano5c47f4c2008-05-17 01:51:31 -07002417static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)
2418{
2419 const char *old_name = patch->old_name;
Junio C Hamanoa9a3e822008-07-09 19:58:23 -07002420 struct patch *tpatch = NULL;
Junio C Hamano5c47f4c2008-05-17 01:51:31 -07002421 int stat_ret = 0;
2422 unsigned st_mode = 0;
2423
2424 /*
2425 * Make sure that we do not have local modifications from the
2426 * index when we are looking at the index. Also make sure
2427 * we have the preimage file to be patched in the work tree,
2428 * unless --cached, which tells git to apply only in the index.
2429 */
2430 if (!old_name)
2431 return 0;
2432
2433 assert(patch->is_new <= 0);
Junio C Hamanoa9a3e822008-07-09 19:58:23 -07002434
2435 if (!(patch->is_copy || patch->is_rename) &&
Michał Kiedrowicz7fac0ee2009-04-11 21:31:00 +02002436 (tpatch = in_fn_table(old_name)) != NULL && !to_be_deleted(tpatch)) {
2437 if (was_deleted(tpatch))
Don Zickus7a078412008-06-27 14:39:12 -04002438 return error("%s: has been deleted/renamed", old_name);
Don Zickus7a078412008-06-27 14:39:12 -04002439 st_mode = tpatch->new_mode;
2440 } else if (!cached) {
Junio C Hamano5c47f4c2008-05-17 01:51:31 -07002441 stat_ret = lstat(old_name, st);
2442 if (stat_ret && errno != ENOENT)
2443 return error("%s: %s", old_name, strerror(errno));
2444 }
Junio C Hamanoa9a3e822008-07-09 19:58:23 -07002445
Michał Kiedrowicz7fac0ee2009-04-11 21:31:00 +02002446 if (to_be_deleted(tpatch))
2447 tpatch = NULL;
2448
Don Zickus7a078412008-06-27 14:39:12 -04002449 if (check_index && !tpatch) {
Junio C Hamano5c47f4c2008-05-17 01:51:31 -07002450 int pos = cache_name_pos(old_name, strlen(old_name));
2451 if (pos < 0) {
2452 if (patch->is_new < 0)
2453 goto is_new;
2454 return error("%s: does not exist in index", old_name);
2455 }
2456 *ce = active_cache[pos];
2457 if (stat_ret < 0) {
2458 struct checkout costate;
2459 /* checkout */
2460 costate.base_dir = "";
2461 costate.base_dir_len = 0;
2462 costate.force = 0;
2463 costate.quiet = 0;
2464 costate.not_new = 0;
2465 costate.refresh_cache = 1;
2466 if (checkout_entry(*ce, &costate, NULL) ||
2467 lstat(old_name, st))
2468 return -1;
2469 }
2470 if (!cached && verify_index_match(*ce, st))
2471 return error("%s: does not match index", old_name);
2472 if (cached)
2473 st_mode = (*ce)->ce_mode;
2474 } else if (stat_ret < 0) {
2475 if (patch->is_new < 0)
2476 goto is_new;
2477 return error("%s: %s", old_name, strerror(errno));
2478 }
2479
Johannes Schindeline1e43892009-02-04 02:50:15 +01002480 if (!cached && !tpatch)
Junio C Hamano5c47f4c2008-05-17 01:51:31 -07002481 st_mode = ce_mode_from_stat(*ce, st->st_mode);
2482
2483 if (patch->is_new < 0)
2484 patch->is_new = 0;
2485 if (!patch->old_mode)
2486 patch->old_mode = st_mode;
2487 if ((st_mode ^ patch->old_mode) & S_IFMT)
2488 return error("%s: wrong type", old_name);
2489 if (st_mode != patch->old_mode)
Miklos Vajnaeca2a8f2009-03-24 02:09:10 +01002490 warning("%s has type %o, expected %o",
Junio C Hamano5c47f4c2008-05-17 01:51:31 -07002491 old_name, st_mode, patch->old_mode);
Junio C Hamanoa15080e2009-01-25 23:41:26 -08002492 if (!patch->new_mode && !patch->is_delete)
Junio C Hamano1f7903a2009-01-02 02:55:37 -08002493 patch->new_mode = st_mode;
Junio C Hamano5c47f4c2008-05-17 01:51:31 -07002494 return 0;
2495
2496 is_new:
2497 patch->is_new = 1;
2498 patch->is_delete = 0;
2499 patch->old_name = NULL;
2500 return 0;
2501}
2502
Don Zickus7a078412008-06-27 14:39:12 -04002503static int check_patch(struct patch *patch)
Linus Torvaldsfab2c252005-05-26 12:25:52 -07002504{
Linus Torvaldsa5772842005-05-26 15:10:02 -07002505 struct stat st;
Linus Torvaldsfab2c252005-05-26 12:25:52 -07002506 const char *old_name = patch->old_name;
2507 const char *new_name = patch->new_name;
Junio C Hamano011f4272005-11-14 17:37:05 -08002508 const char *name = old_name ? old_name : new_name;
Junio C Hamano04e48882006-05-15 15:15:47 -07002509 struct cache_entry *ce = NULL;
Michał Kiedrowicz7fac0ee2009-04-11 21:31:00 +02002510 struct patch *tpatch;
Junio C Hamano7f95aef2006-07-17 00:10:47 -07002511 int ok_if_exists;
Junio C Hamano5c47f4c2008-05-17 01:51:31 -07002512 int status;
Linus Torvaldsfab2c252005-05-26 12:25:52 -07002513
Junio C Hamano57dc3972006-08-16 17:55:29 -07002514 patch->rejected = 1; /* we will drop this after we succeed */
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002515
Junio C Hamano5c47f4c2008-05-17 01:51:31 -07002516 status = check_preimage(patch, &ce, &st);
2517 if (status)
2518 return status;
2519 old_name = patch->old_name;
Linus Torvaldsa5772842005-05-26 15:10:02 -07002520
Michał Kiedrowicz7fac0ee2009-04-11 21:31:00 +02002521 if ((tpatch = in_fn_table(new_name)) &&
2522 (was_deleted(tpatch) || to_be_deleted(tpatch)))
Junio C Hamano81bf96b2007-11-23 02:37:03 -08002523 /*
2524 * A type-change diff is always split into a patch to
Junio C Hamano7f95aef2006-07-17 00:10:47 -07002525 * delete old, immediately followed by a patch to
2526 * create new (see diff.c::run_diff()); in such a case
2527 * it is Ok that the entry to be deleted by the
2528 * previous patch is still in the working tree and in
2529 * the index.
2530 */
2531 ok_if_exists = 1;
2532 else
2533 ok_if_exists = 0;
2534
Junio C Hamano4be60962006-09-17 01:04:24 -07002535 if (new_name &&
2536 ((0 < patch->is_new) | (0 < patch->is_rename) | patch->is_copy)) {
Junio C Hamano7f95aef2006-07-17 00:10:47 -07002537 if (check_index &&
2538 cache_name_pos(new_name, strlen(new_name)) >= 0 &&
2539 !ok_if_exists)
Linus Torvaldsa5772842005-05-26 15:10:02 -07002540 return error("%s: already exists in index", new_name);
Junio C Hamanod91d4c22006-05-17 16:56:13 -07002541 if (!cached) {
Junio C Hamano64cab592007-05-11 22:26:08 -07002542 int err = check_to_create_blob(new_name, ok_if_exists);
2543 if (err)
2544 return err;
Junio C Hamanod91d4c22006-05-17 16:56:13 -07002545 }
Johannes Schindelin35cc4bc2005-08-17 09:01:07 +02002546 if (!patch->new_mode) {
Junio C Hamano4be60962006-09-17 01:04:24 -07002547 if (0 < patch->is_new)
Johannes Schindelin35cc4bc2005-08-17 09:01:07 +02002548 patch->new_mode = S_IFREG | 0644;
2549 else
2550 patch->new_mode = patch->old_mode;
2551 }
Linus Torvaldsa5772842005-05-26 15:10:02 -07002552 }
Linus Torvalds3cca9282005-06-05 11:03:13 -07002553
2554 if (new_name && old_name) {
2555 int same = !strcmp(old_name, new_name);
2556 if (!patch->new_mode)
2557 patch->new_mode = patch->old_mode;
2558 if ((patch->old_mode ^ patch->new_mode) & S_IFMT)
2559 return error("new mode (%o) of %s does not match old mode (%o)%s%s",
2560 patch->new_mode, new_name, patch->old_mode,
2561 same ? "" : " of ", same ? "" : old_name);
Junio C Hamano04e48882006-05-15 15:15:47 -07002562 }
Linus Torvalds3cca9282005-06-05 11:03:13 -07002563
Junio C Hamano04e48882006-05-15 15:15:47 -07002564 if (apply_data(patch, &st, ce) < 0)
Junio C Hamano011f4272005-11-14 17:37:05 -08002565 return error("%s: patch does not apply", name);
Junio C Hamano57dc3972006-08-16 17:55:29 -07002566 patch->rejected = 0;
Linus Torvaldsa5772842005-05-26 15:10:02 -07002567 return 0;
2568}
2569
2570static int check_patch_list(struct patch *patch)
2571{
Pierre Habouzit60b7f382006-08-23 12:39:10 +02002572 int err = 0;
Linus Torvaldsa5772842005-05-26 15:10:02 -07002573
Michał Kiedrowicz7fac0ee2009-04-11 21:31:00 +02002574 prepare_fn_table(patch);
Don Zickus7a078412008-06-27 14:39:12 -04002575 while (patch) {
Junio C Hamanoa2bf4042006-08-18 03:14:48 -07002576 if (apply_verbosely)
2577 say_patch_name(stderr,
2578 "Checking patch ", patch, "...\n");
Don Zickus7a078412008-06-27 14:39:12 -04002579 err |= check_patch(patch);
2580 patch = patch->next;
Junio C Hamano7f95aef2006-07-17 00:10:47 -07002581 }
Pierre Habouzit60b7f382006-08-23 12:39:10 +02002582 return err;
Linus Torvaldsa5772842005-05-26 15:10:02 -07002583}
2584
Johannes Schindelinece7b742007-09-17 01:24:57 +01002585/* This function tries to read the sha1 from the current index */
2586static int get_current_sha1(const char *path, unsigned char *sha1)
2587{
2588 int pos;
2589
2590 if (read_cache() < 0)
2591 return -1;
2592 pos = cache_name_pos(path, strlen(path));
2593 if (pos < 0)
2594 return -1;
2595 hashcpy(sha1, active_cache[pos]->sha1);
2596 return 0;
2597}
2598
Johannes Schindelin7a988692007-09-17 23:34:06 +01002599/* Build an index that contains the just the files needed for a 3way merge */
2600static void build_fake_ancestor(struct patch *list, const char *filename)
Junio C Hamano2cf67f12005-10-07 03:42:00 -07002601{
2602 struct patch *patch;
Johannes Schindelin7a988692007-09-17 23:34:06 +01002603 struct index_state result = { 0 };
2604 int fd;
Junio C Hamano2cf67f12005-10-07 03:42:00 -07002605
2606 /* Once we start supporting the reverse patch, it may be
2607 * worth showing the new sha1 prefix, but until then...
2608 */
2609 for (patch = list; patch; patch = patch->next) {
2610 const unsigned char *sha1_ptr;
2611 unsigned char sha1[20];
Johannes Schindelin7a988692007-09-17 23:34:06 +01002612 struct cache_entry *ce;
Junio C Hamano2cf67f12005-10-07 03:42:00 -07002613 const char *name;
2614
2615 name = patch->old_name ? patch->old_name : patch->new_name;
Junio C Hamano4be60962006-09-17 01:04:24 -07002616 if (0 < patch->is_new)
Johannes Schindelin7a988692007-09-17 23:34:06 +01002617 continue;
Junio C Hamano2cf67f12005-10-07 03:42:00 -07002618 else if (get_sha1(patch->old_sha1_prefix, sha1))
Johannes Schindelinece7b742007-09-17 01:24:57 +01002619 /* git diff has no index line for mode/type changes */
2620 if (!patch->lines_added && !patch->lines_deleted) {
2621 if (get_current_sha1(patch->new_name, sha1) ||
2622 get_current_sha1(patch->old_name, sha1))
2623 die("mode change for %s, which is not "
2624 "in current HEAD", name);
2625 sha1_ptr = sha1;
2626 } else
2627 die("sha1 information is lacking or useless "
2628 "(%s).", name);
Junio C Hamano2cf67f12005-10-07 03:42:00 -07002629 else
2630 sha1_ptr = sha1;
Junio C Hamano22943f12005-10-14 21:54:52 -07002631
Johannes Schindelin7a988692007-09-17 23:34:06 +01002632 ce = make_cache_entry(patch->old_mode, sha1_ptr, name, 0, 0);
Dmitry Potapov048f2762008-10-05 06:14:40 +04002633 if (!ce)
2634 die("make_cache_entry failed for path '%s'", name);
Johannes Schindelin7a988692007-09-17 23:34:06 +01002635 if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))
2636 die ("Could not add %s to temporary index", name);
Junio C Hamano2cf67f12005-10-07 03:42:00 -07002637 }
Johannes Schindelin7a988692007-09-17 23:34:06 +01002638
2639 fd = open(filename, O_WRONLY | O_CREAT, 0666);
2640 if (fd < 0 || write_index(&result, fd) || close(fd))
2641 die ("Could not write temporary index to %s", filename);
2642
2643 discard_index(&result);
Junio C Hamano2cf67f12005-10-07 03:42:00 -07002644}
2645
Linus Torvaldsa5772842005-05-26 15:10:02 -07002646static void stat_patch_list(struct patch *patch)
Linus Torvalds19c58fb2005-05-26 10:23:51 -07002647{
Linus Torvalds3f403152005-05-26 11:40:43 -07002648 int files, adds, dels;
2649
Linus Torvaldsa5772842005-05-26 15:10:02 -07002650 for (files = adds = dels = 0 ; patch ; patch = patch->next) {
2651 files++;
2652 adds += patch->lines_added;
2653 dels += patch->lines_deleted;
2654 show_stats(patch);
2655 }
Linus Torvalds19c58fb2005-05-26 10:23:51 -07002656
Linus Torvaldsa5772842005-05-26 15:10:02 -07002657 printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
Linus Torvalds3f403152005-05-26 11:40:43 -07002658}
2659
Junio C Hamano7d8b7c22005-10-28 02:43:31 -07002660static void numstat_patch_list(struct patch *patch)
2661{
2662 for ( ; patch; patch = patch->next) {
2663 const char *name;
Junio C Hamano49e33432006-05-14 21:59:04 -07002664 name = patch->new_name ? patch->new_name : patch->old_name;
Junio C Hamanoef58d952006-11-14 22:23:18 -08002665 if (patch->is_binary)
2666 printf("-\t-\t");
2667 else
Pierre Habouzit663af342007-09-20 00:42:15 +02002668 printf("%d\t%d\t", patch->lines_added, patch->lines_deleted);
2669 write_name_quoted(name, stdout, line_termination);
Junio C Hamano7d8b7c22005-10-28 02:43:31 -07002670 }
2671}
2672
Junio C Hamano96c912a2005-06-22 02:29:46 -07002673static void show_file_mode_name(const char *newdelete, unsigned int mode, const char *name)
2674{
2675 if (mode)
2676 printf(" %s mode %06o %s\n", newdelete, mode, name);
2677 else
2678 printf(" %s %s\n", newdelete, name);
2679}
2680
2681static void show_mode_change(struct patch *p, int show_name)
2682{
2683 if (p->old_mode && p->new_mode && p->old_mode != p->new_mode) {
2684 if (show_name)
2685 printf(" mode change %06o => %06o %s\n",
2686 p->old_mode, p->new_mode, p->new_name);
2687 else
2688 printf(" mode change %06o => %06o\n",
2689 p->old_mode, p->new_mode);
2690 }
2691}
2692
2693static void show_rename_copy(struct patch *p)
2694{
2695 const char *renamecopy = p->is_rename ? "rename" : "copy";
2696 const char *old, *new;
2697
2698 /* Find common prefix */
2699 old = p->old_name;
2700 new = p->new_name;
2701 while (1) {
2702 const char *slash_old, *slash_new;
2703 slash_old = strchr(old, '/');
2704 slash_new = strchr(new, '/');
2705 if (!slash_old ||
2706 !slash_new ||
2707 slash_old - old != slash_new - new ||
2708 memcmp(old, new, slash_new - new))
2709 break;
2710 old = slash_old + 1;
2711 new = slash_new + 1;
2712 }
2713 /* p->old_name thru old is the common prefix, and old and new
2714 * through the end of names are renames
2715 */
2716 if (old != p->old_name)
2717 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
Tony Lucke30e8142005-07-12 11:54:21 -07002718 (int)(old - p->old_name), p->old_name,
Junio C Hamano96c912a2005-06-22 02:29:46 -07002719 old, new, p->score);
2720 else
2721 printf(" %s %s => %s (%d%%)\n", renamecopy,
2722 p->old_name, p->new_name, p->score);
2723 show_mode_change(p, 0);
2724}
2725
2726static void summary_patch_list(struct patch *patch)
2727{
2728 struct patch *p;
2729
2730 for (p = patch; p; p = p->next) {
2731 if (p->is_new)
2732 show_file_mode_name("create", p->new_mode, p->new_name);
2733 else if (p->is_delete)
2734 show_file_mode_name("delete", p->old_mode, p->old_name);
2735 else {
2736 if (p->is_rename || p->is_copy)
2737 show_rename_copy(p);
2738 else {
2739 if (p->score) {
2740 printf(" rewrite %s (%d%%)\n",
2741 p->new_name, p->score);
2742 show_mode_change(p, 0);
2743 }
2744 else
2745 show_mode_change(p, 1);
2746 }
2747 }
2748 }
2749}
2750
Linus Torvalds3f403152005-05-26 11:40:43 -07002751static void patch_stats(struct patch *patch)
2752{
2753 int lines = patch->lines_added + patch->lines_deleted;
2754
2755 if (lines > max_change)
2756 max_change = lines;
2757 if (patch->old_name) {
Junio C Hamano22943f12005-10-14 21:54:52 -07002758 int len = quote_c_style(patch->old_name, NULL, NULL, 0);
2759 if (!len)
2760 len = strlen(patch->old_name);
Linus Torvalds3f403152005-05-26 11:40:43 -07002761 if (len > max_len)
2762 max_len = len;
2763 }
2764 if (patch->new_name) {
Junio C Hamano22943f12005-10-14 21:54:52 -07002765 int len = quote_c_style(patch->new_name, NULL, NULL, 0);
2766 if (!len)
2767 len = strlen(patch->new_name);
Linus Torvalds3f403152005-05-26 11:40:43 -07002768 if (len > max_len)
2769 max_len = len;
2770 }
Linus Torvalds19c58fb2005-05-26 10:23:51 -07002771}
2772
Junio C Hamanoaea19452007-02-19 17:58:58 -08002773static void remove_file(struct patch *patch, int rmdir_empty)
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002774{
Junio C Hamano7da3bf32007-04-01 22:46:06 -07002775 if (update_index) {
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002776 if (remove_file_from_cache(patch->old_name) < 0)
2777 die("unable to remove %s from index", patch->old_name);
2778 }
Alexandre Julliardd234b212007-01-09 21:25:46 +01002779 if (!cached) {
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002780 if (S_ISGITLINK(patch->old_mode)) {
2781 if (rmdir(patch->old_name))
2782 warning("unable to remove submodule %s",
2783 patch->old_name);
2784 } else if (!unlink(patch->old_name) && rmdir_empty) {
Alex Riesen175a4942008-09-27 00:59:14 +02002785 remove_path(patch->old_name);
Alexandre Julliardd234b212007-01-09 21:25:46 +01002786 }
2787 }
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002788}
2789
2790static void add_index_file(const char *path, unsigned mode, void *buf, unsigned long size)
2791{
2792 struct stat st;
2793 struct cache_entry *ce;
2794 int namelen = strlen(path);
2795 unsigned ce_size = cache_entry_size(namelen);
2796
Junio C Hamano7da3bf32007-04-01 22:46:06 -07002797 if (!update_index)
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002798 return;
2799
Peter Eriksen90321c12006-04-03 19:30:46 +01002800 ce = xcalloc(1, ce_size);
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002801 memcpy(ce->name, path, namelen);
2802 ce->ce_mode = create_ce_mode(mode);
Linus Torvalds7a51ed62008-01-14 16:03:17 -08002803 ce->ce_flags = namelen;
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002804 if (S_ISGITLINK(mode)) {
2805 const char *s = buf;
2806
2807 if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1))
2808 die("corrupt patch for subproject %s", path);
2809 } else {
2810 if (!cached) {
2811 if (lstat(path, &st) < 0)
2812 die("unable to stat newly created file %s",
2813 path);
2814 fill_stat_cache_info(ce, &st);
2815 }
2816 if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0)
2817 die("unable to create backing store for newly created file %s", path);
Junio C Hamano04e48882006-05-15 15:15:47 -07002818 }
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002819 if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
2820 die("unable to add cache entry for %s", path);
2821}
2822
Linus Torvalds1b668342005-07-13 17:25:53 -07002823static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
2824{
Alex Riesenac78e542007-04-19 02:05:03 +02002825 int fd;
Brandon Caseyf285a2d2008-10-09 14:12:12 -05002826 struct strbuf nbuf = STRBUF_INIT;
Linus Torvalds1b668342005-07-13 17:25:53 -07002827
Sven Verdoolaegee06c5a62007-08-15 19:22:09 +02002828 if (S_ISGITLINK(mode)) {
2829 struct stat st;
2830 if (!lstat(path, &st) && S_ISDIR(st.st_mode))
2831 return 0;
2832 return mkdir(path, 0777);
2833 }
2834
Johannes Sixt78a8d642007-03-02 22:11:30 +01002835 if (has_symlinks && S_ISLNK(mode))
Junio C Hamano2c718102006-08-09 22:47:25 -07002836 /* Although buf:size is counted string, it also is NUL
2837 * terminated.
2838 */
Linus Torvalds1b668342005-07-13 17:25:53 -07002839 return symlink(buf, path);
Junio C Hamano67160272007-02-17 12:37:25 -08002840
Alex Riesen781411e2006-01-05 09:58:06 +01002841 fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
Linus Torvalds1b668342005-07-13 17:25:53 -07002842 if (fd < 0)
2843 return -1;
Junio C Hamanocc96fd02007-03-22 17:32:51 -07002844
Pierre Habouzit5ecd2932007-09-16 15:51:04 +02002845 if (convert_to_working_tree(path, buf, size, &nbuf)) {
2846 size = nbuf.len;
2847 buf = nbuf.buf;
Linus Torvalds1b668342005-07-13 17:25:53 -07002848 }
Pierre Habouzitc7f9cb12007-09-16 18:54:42 +02002849 write_or_die(fd, buf, size);
2850 strbuf_release(&nbuf);
Linus Torvalds1b668342005-07-13 17:25:53 -07002851
Linus Torvalds1b668342005-07-13 17:25:53 -07002852 if (close(fd) < 0)
2853 die("closing file %s: %s", path, strerror(errno));
2854 return 0;
2855}
2856
Linus Torvalds5c8af182005-06-21 19:10:21 -07002857/*
2858 * We optimistically assume that the directories exist,
2859 * which is true 99% of the time anyway. If they don't,
2860 * we create them and try again.
2861 */
Jason Riedy8361e1d2006-02-03 22:50:57 -08002862static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
Linus Torvalds5c8af182005-06-21 19:10:21 -07002863{
Junio C Hamano04e48882006-05-15 15:15:47 -07002864 if (cached)
2865 return;
Linus Torvalds1b668342005-07-13 17:25:53 -07002866 if (!try_create_file(path, mode, buf, size))
2867 return;
Linus Torvalds5c8af182005-06-21 19:10:21 -07002868
Linus Torvalds1b668342005-07-13 17:25:53 -07002869 if (errno == ENOENT) {
Jason Riedy8361e1d2006-02-03 22:50:57 -08002870 if (safe_create_leading_directories(path))
2871 return;
Linus Torvalds1b668342005-07-13 17:25:53 -07002872 if (!try_create_file(path, mode, buf, size))
2873 return;
Linus Torvalds5c8af182005-06-21 19:10:21 -07002874 }
Linus Torvalds5c8af182005-06-21 19:10:21 -07002875
Johannes Schindelin56ac1682006-07-18 19:46:34 +02002876 if (errno == EEXIST || errno == EACCES) {
Junio C Hamanoc28c5712006-07-16 23:28:23 -07002877 /* We may be trying to create a file where a directory
2878 * used to be.
2879 */
2880 struct stat st;
Alex Riesen0afa7642007-04-18 23:58:56 +02002881 if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path)))
Junio C Hamanoc28c5712006-07-16 23:28:23 -07002882 errno = EEXIST;
2883 }
2884
2885 if (errno == EEXIST) {
Linus Torvalds1b668342005-07-13 17:25:53 -07002886 unsigned int nr = getpid();
Linus Torvalds5c8af182005-06-21 19:10:21 -07002887
Linus Torvalds1b668342005-07-13 17:25:53 -07002888 for (;;) {
Alex Riesen9fa03c12008-10-26 23:08:52 +01002889 char newpath[PATH_MAX];
2890 mksnpath(newpath, sizeof(newpath), "%s~%u", path, nr);
Linus Torvalds1b668342005-07-13 17:25:53 -07002891 if (!try_create_file(newpath, mode, buf, size)) {
2892 if (!rename(newpath, path))
2893 return;
2894 unlink(newpath);
2895 break;
2896 }
2897 if (errno != EEXIST)
2898 break;
Alex Riesend9e08be2006-01-05 10:00:12 +01002899 ++nr;
2900 }
Linus Torvalds5c8af182005-06-21 19:10:21 -07002901 }
Linus Torvalds1b668342005-07-13 17:25:53 -07002902 die("unable to write file %s mode %o", path, mode);
Linus Torvalds5c8af182005-06-21 19:10:21 -07002903}
2904
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002905static void create_file(struct patch *patch)
2906{
Jason Riedy8361e1d2006-02-03 22:50:57 -08002907 char *path = patch->new_name;
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002908 unsigned mode = patch->new_mode;
2909 unsigned long size = patch->resultsize;
2910 char *buf = patch->result;
2911
2912 if (!mode)
2913 mode = S_IFREG | 0644;
Junio C Hamano03ac6e62006-04-23 16:52:52 -07002914 create_one_file(path, mode, buf, size);
Linus Torvalds1b668342005-07-13 17:25:53 -07002915 add_index_file(path, mode, buf, size);
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002916}
2917
Junio C Hamanoeed46642006-07-16 23:52:09 -07002918/* phase zero is to remove, phase one is to create */
2919static void write_out_one_result(struct patch *patch, int phase)
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002920{
2921 if (patch->is_delete > 0) {
Junio C Hamanoeed46642006-07-16 23:52:09 -07002922 if (phase == 0)
Junio C Hamanoaea19452007-02-19 17:58:58 -08002923 remove_file(patch, 1);
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002924 return;
2925 }
2926 if (patch->is_new > 0 || patch->is_copy) {
Junio C Hamanoeed46642006-07-16 23:52:09 -07002927 if (phase == 1)
2928 create_file(patch);
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002929 return;
2930 }
2931 /*
2932 * Rename or modification boils down to the same
2933 * thing: remove the old, write the new
2934 */
Junio C Hamanoeed46642006-07-16 23:52:09 -07002935 if (phase == 0)
Linus Torvalds93969432007-08-04 21:48:08 -07002936 remove_file(patch, patch->is_rename);
Junio C Hamanoeed46642006-07-16 23:52:09 -07002937 if (phase == 1)
Junio C Hamano57dc3972006-08-16 17:55:29 -07002938 create_file(patch);
Linus Torvalds5aa7d942005-06-05 14:05:43 -07002939}
2940
Junio C Hamano57dc3972006-08-16 17:55:29 -07002941static int write_out_one_reject(struct patch *patch)
2942{
Junio C Hamano82e27652006-08-18 03:10:19 -07002943 FILE *rej;
2944 char namebuf[PATH_MAX];
Junio C Hamano57dc3972006-08-16 17:55:29 -07002945 struct fragment *frag;
Junio C Hamano82e27652006-08-18 03:10:19 -07002946 int cnt = 0;
Junio C Hamano57dc3972006-08-16 17:55:29 -07002947
Junio C Hamano82e27652006-08-18 03:10:19 -07002948 for (cnt = 0, frag = patch->fragments; frag; frag = frag->next) {
Junio C Hamano57dc3972006-08-16 17:55:29 -07002949 if (!frag->rejected)
2950 continue;
Junio C Hamano82e27652006-08-18 03:10:19 -07002951 cnt++;
Junio C Hamano57dc3972006-08-16 17:55:29 -07002952 }
Junio C Hamano82e27652006-08-18 03:10:19 -07002953
Junio C Hamanoa2bf4042006-08-18 03:14:48 -07002954 if (!cnt) {
2955 if (apply_verbosely)
2956 say_patch_name(stderr,
2957 "Applied patch ", patch, " cleanly.\n");
Junio C Hamano82e27652006-08-18 03:10:19 -07002958 return 0;
Junio C Hamanoa2bf4042006-08-18 03:14:48 -07002959 }
Junio C Hamano82e27652006-08-18 03:10:19 -07002960
2961 /* This should not happen, because a removal patch that leaves
2962 * contents are marked "rejected" at the patch level.
2963 */
2964 if (!patch->new_name)
2965 die("internal error");
2966
Junio C Hamanoa2bf4042006-08-18 03:14:48 -07002967 /* Say this even without --verbose */
2968 say_patch_name(stderr, "Applying patch ", patch, " with");
2969 fprintf(stderr, " %d rejects...\n", cnt);
2970
Junio C Hamano82e27652006-08-18 03:10:19 -07002971 cnt = strlen(patch->new_name);
2972 if (ARRAY_SIZE(namebuf) <= cnt + 5) {
2973 cnt = ARRAY_SIZE(namebuf) - 5;
Miklos Vajnaeca2a8f2009-03-24 02:09:10 +01002974 warning("truncating .rej filename to %.*s.rej",
Junio C Hamano82e27652006-08-18 03:10:19 -07002975 cnt - 1, patch->new_name);
2976 }
2977 memcpy(namebuf, patch->new_name, cnt);
2978 memcpy(namebuf + cnt, ".rej", 5);
2979
2980 rej = fopen(namebuf, "w");
2981 if (!rej)
2982 return error("cannot open %s: %s", namebuf, strerror(errno));
2983
2984 /* Normal git tools never deal with .rej, so do not pretend
2985 * this is a git patch by saying --git nor give extended
2986 * headers. While at it, maybe please "kompare" that wants
2987 * the trailing TAB and some garbage at the end of line ;-).
2988 */
2989 fprintf(rej, "diff a/%s b/%s\t(rejected hunks)\n",
2990 patch->new_name, patch->new_name);
Junio C Hamano0e9ee322006-08-22 15:49:28 -07002991 for (cnt = 1, frag = patch->fragments;
Junio C Hamano82e27652006-08-18 03:10:19 -07002992 frag;
2993 cnt++, frag = frag->next) {
2994 if (!frag->rejected) {
2995 fprintf(stderr, "Hunk #%d applied cleanly.\n", cnt);
2996 continue;
2997 }
2998 fprintf(stderr, "Rejected hunk #%d.\n", cnt);
2999 fprintf(rej, "%.*s", frag->size, frag->patch);
3000 if (frag->patch[frag->size-1] != '\n')
3001 fputc('\n', rej);
3002 }
3003 fclose(rej);
3004 return -1;
Junio C Hamano57dc3972006-08-16 17:55:29 -07003005}
3006
3007static int write_out_results(struct patch *list, int skipped_patch)
Linus Torvalds5aa7d942005-06-05 14:05:43 -07003008{
Junio C Hamanoeed46642006-07-16 23:52:09 -07003009 int phase;
Junio C Hamano57dc3972006-08-16 17:55:29 -07003010 int errs = 0;
3011 struct patch *l;
Junio C Hamanoeed46642006-07-16 23:52:09 -07003012
Junio C Hamanod854f782005-07-22 09:56:57 -07003013 if (!list && !skipped_patch)
Junio C Hamano57dc3972006-08-16 17:55:29 -07003014 return error("No changes");
Linus Torvaldsf7b79702005-06-05 15:25:28 -07003015
Junio C Hamanoeed46642006-07-16 23:52:09 -07003016 for (phase = 0; phase < 2; phase++) {
Junio C Hamano57dc3972006-08-16 17:55:29 -07003017 l = list;
Junio C Hamanoeed46642006-07-16 23:52:09 -07003018 while (l) {
Junio C Hamano57dc3972006-08-16 17:55:29 -07003019 if (l->rejected)
3020 errs = 1;
Junio C Hamano82e27652006-08-18 03:10:19 -07003021 else {
Junio C Hamano57dc3972006-08-16 17:55:29 -07003022 write_out_one_result(l, phase);
Junio C Hamano82e27652006-08-18 03:10:19 -07003023 if (phase == 1 && write_out_one_reject(l))
Junio C Hamano57dc3972006-08-16 17:55:29 -07003024 errs = 1;
3025 }
Junio C Hamanoeed46642006-07-16 23:52:09 -07003026 l = l->next;
3027 }
Linus Torvalds5aa7d942005-06-05 14:05:43 -07003028 }
Junio C Hamano57dc3972006-08-16 17:55:29 -07003029 return errs;
Linus Torvalds5aa7d942005-06-05 14:05:43 -07003030}
3031
Junio C Hamano021b6e42006-06-06 12:51:49 -07003032static struct lock_file lock_file;
Linus Torvalds5aa7d942005-06-05 14:05:43 -07003033
Junio C Hamano6ecb1ee2008-08-25 01:05:31 -07003034static struct string_list limit_by_name;
3035static int has_include;
3036static void add_name_limit(const char *name, int exclude)
3037{
3038 struct string_list_item *it;
3039
3040 it = string_list_append(name, &limit_by_name);
3041 it->util = exclude ? NULL : (void *) 1;
3042}
Junio C Hamanod854f782005-07-22 09:56:57 -07003043
3044static int use_patch(struct patch *p)
3045{
Jason Riedyc7c81b32005-08-23 13:34:07 -07003046 const char *pathname = p->new_name ? p->new_name : p->old_name;
Junio C Hamano6ecb1ee2008-08-25 01:05:31 -07003047 int i;
3048
3049 /* Paths outside are not touched regardless of "--include" */
Junio C Hamanoedf2e372005-11-25 23:14:15 -08003050 if (0 < prefix_length) {
3051 int pathlen = strlen(pathname);
3052 if (pathlen <= prefix_length ||
3053 memcmp(prefix, pathname, prefix_length))
3054 return 0;
3055 }
Junio C Hamano6ecb1ee2008-08-25 01:05:31 -07003056
3057 /* See if it matches any of exclude/include rule */
3058 for (i = 0; i < limit_by_name.nr; i++) {
3059 struct string_list_item *it = &limit_by_name.items[i];
3060 if (!fnmatch(it->string, pathname, 0))
3061 return (it->util != NULL);
3062 }
3063
3064 /*
3065 * If we had any include, a path that does not match any rule is
3066 * not used. Otherwise, we saw bunch of exclude rules (or none)
3067 * and such a path is used.
3068 */
3069 return !has_include;
Junio C Hamanod854f782005-07-22 09:56:57 -07003070}
3071
Junio C Hamano6ecb1ee2008-08-25 01:05:31 -07003072
Johannes Schindelineac70c42007-02-20 03:45:49 +01003073static void prefix_one(char **name)
Junio C Hamano56185f42007-02-19 17:57:29 -08003074{
Johannes Schindelineac70c42007-02-20 03:45:49 +01003075 char *old_name = *name;
3076 if (!old_name)
3077 return;
3078 *name = xstrdup(prefix_filename(prefix, prefix_length, *name));
3079 free(old_name);
Junio C Hamano56185f42007-02-19 17:57:29 -08003080}
3081
3082static void prefix_patches(struct patch *p)
3083{
Junio C Hamano9987d7c2007-02-21 14:31:10 -08003084 if (!prefix || p->is_toplevel_relative)
Junio C Hamano56185f42007-02-19 17:57:29 -08003085 return;
3086 for ( ; p; p = p->next) {
Junio C Hamano6c912f52007-02-21 00:58:18 -08003087 if (p->new_name == p->old_name) {
3088 char *prefixed = p->new_name;
3089 prefix_one(&prefixed);
3090 p->new_name = p->old_name = prefixed;
3091 }
3092 else {
Johannes Schindelineac70c42007-02-20 03:45:49 +01003093 prefix_one(&p->new_name);
Junio C Hamano6c912f52007-02-21 00:58:18 -08003094 prefix_one(&p->old_name);
3095 }
Junio C Hamano56185f42007-02-19 17:57:29 -08003096 }
3097}
3098
Johannes Schindelinc14b9d12008-06-27 18:43:09 +01003099#define INACCURATE_EOF (1<<0)
3100#define RECOUNT (1<<1)
3101
3102static int apply_patch(int fd, const char *filename, int options)
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003103{
Pierre Habouzit9a76ade2007-09-27 13:33:19 +02003104 size_t offset;
Brandon Caseyf285a2d2008-10-09 14:12:12 -05003105 struct strbuf buf = STRBUF_INIT;
Linus Torvalds19c58fb2005-05-26 10:23:51 -07003106 struct patch *list = NULL, **listp = &list;
Junio C Hamanod854f782005-07-22 09:56:57 -07003107 int skipped_patch = 0;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003108
Don Zickus7a078412008-06-27 14:39:12 -04003109 /* FIXME - memory leak when using multiple patch files as inputs */
Johannes Schindelinc455c872008-07-21 19:03:49 +01003110 memset(&fn_table, 0, sizeof(struct string_list));
Junio C Hamanob5767dd2006-02-26 18:13:25 -08003111 patch_input_file = filename;
Pierre Habouzit9a76ade2007-09-27 13:33:19 +02003112 read_patch_file(&buf, fd);
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003113 offset = 0;
Pierre Habouzit9a76ade2007-09-27 13:33:19 +02003114 while (offset < buf.len) {
Linus Torvalds19c58fb2005-05-26 10:23:51 -07003115 struct patch *patch;
3116 int nr;
3117
Peter Eriksen90321c12006-04-03 19:30:46 +01003118 patch = xcalloc(1, sizeof(*patch));
Johannes Schindelinc14b9d12008-06-27 18:43:09 +01003119 patch->inaccurate_eof = !!(options & INACCURATE_EOF);
3120 patch->recount = !!(options & RECOUNT);
Junio C Hamanof94bf442007-10-03 17:42:52 -07003121 nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003122 if (nr < 0)
3123 break;
Junio C Hamanof686d032006-08-14 23:26:51 -07003124 if (apply_in_reverse)
Johannes Schindeline5a94312006-07-28 17:46:11 +02003125 reverse_patches(patch);
Junio C Hamano56185f42007-02-19 17:57:29 -08003126 if (prefix)
3127 prefix_patches(patch);
Junio C Hamanod854f782005-07-22 09:56:57 -07003128 if (use_patch(patch)) {
3129 patch_stats(patch);
3130 *listp = patch;
3131 listp = &patch->next;
Junio C Hamano56185f42007-02-19 17:57:29 -08003132 }
3133 else {
Junio C Hamanod854f782005-07-22 09:56:57 -07003134 /* perhaps free it a bit better? */
3135 free(patch);
3136 skipped_patch++;
3137 }
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003138 offset += nr;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003139 }
Linus Torvalds19c58fb2005-05-26 10:23:51 -07003140
Junio C Hamano81bf96b2007-11-23 02:37:03 -08003141 if (whitespace_error && (ws_error_action == die_on_ws_error))
Junio C Hamanob5767dd2006-02-26 18:13:25 -08003142 apply = 0;
3143
Junio C Hamano7da3bf32007-04-01 22:46:06 -07003144 update_index = check_index && apply;
3145 if (update_index && newfd < 0)
Junio C Hamano30ca07a2007-03-31 23:09:02 -07003146 newfd = hold_locked_index(&lock_file, 1);
3147
Linus Torvalds5aa7d942005-06-05 14:05:43 -07003148 if (check_index) {
3149 if (read_cache() < 0)
3150 die("unable to read index file");
3151 }
3152
Junio C Hamano57dc3972006-08-16 17:55:29 -07003153 if ((check || apply) &&
3154 check_patch_list(list) < 0 &&
3155 !apply_with_reject)
Linus Torvaldsa5772842005-05-26 15:10:02 -07003156 exit(1);
3157
Junio C Hamano57dc3972006-08-16 17:55:29 -07003158 if (apply && write_out_results(list, skipped_patch))
3159 exit(1);
Linus Torvalds5aa7d942005-06-05 14:05:43 -07003160
Johannes Schindelin7a988692007-09-17 23:34:06 +01003161 if (fake_ancestor)
3162 build_fake_ancestor(list, fake_ancestor);
Junio C Hamano2cf67f12005-10-07 03:42:00 -07003163
Linus Torvaldsa5772842005-05-26 15:10:02 -07003164 if (diffstat)
3165 stat_patch_list(list);
Linus Torvalds19c58fb2005-05-26 10:23:51 -07003166
Junio C Hamano7d8b7c22005-10-28 02:43:31 -07003167 if (numstat)
3168 numstat_patch_list(list);
3169
Junio C Hamano96c912a2005-06-22 02:29:46 -07003170 if (summary)
3171 summary_patch_list(list);
3172
Pierre Habouzit9a76ade2007-09-27 13:33:19 +02003173 strbuf_release(&buf);
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003174 return 0;
3175}
3176
Johannes Schindelinef90d6d2008-05-14 18:46:53 +01003177static int git_apply_config(const char *var, const char *value, void *cb)
Junio C Hamano2ae1c532006-02-27 14:47:45 -08003178{
Stephan Beyer8e4c6aa2008-04-08 10:42:33 +02003179 if (!strcmp(var, "apply.whitespace"))
3180 return git_config_string(&apply_default_whitespace, var, value);
Johannes Schindelinef90d6d2008-05-14 18:46:53 +01003181 return git_default_config(var, value, cb);
Junio C Hamano2ae1c532006-02-27 14:47:45 -08003182}
3183
Miklos Vajnaf26c4942008-12-28 00:03:57 +01003184static int option_parse_exclude(const struct option *opt,
3185 const char *arg, int unset)
3186{
3187 add_name_limit(arg, 1);
3188 return 0;
3189}
3190
3191static int option_parse_include(const struct option *opt,
3192 const char *arg, int unset)
3193{
3194 add_name_limit(arg, 0);
3195 has_include = 1;
3196 return 0;
3197}
3198
3199static int option_parse_p(const struct option *opt,
3200 const char *arg, int unset)
3201{
3202 p_value = atoi(arg);
3203 p_value_known = 1;
3204 return 0;
3205}
3206
3207static int option_parse_z(const struct option *opt,
3208 const char *arg, int unset)
3209{
3210 if (unset)
3211 line_termination = '\n';
3212 else
3213 line_termination = 0;
3214 return 0;
3215}
3216
3217static int option_parse_whitespace(const struct option *opt,
3218 const char *arg, int unset)
3219{
3220 const char **whitespace_option = opt->value;
3221
3222 *whitespace_option = arg;
3223 parse_whitespace_option(arg);
3224 return 0;
3225}
3226
3227static int option_parse_directory(const struct option *opt,
3228 const char *arg, int unset)
3229{
3230 root_len = strlen(arg);
3231 if (root_len && arg[root_len - 1] != '/') {
3232 char *new_root;
3233 root = new_root = xmalloc(root_len + 2);
3234 strcpy(new_root, arg);
3235 strcpy(new_root + root_len++, "/");
3236 } else
3237 root = arg;
3238 return 0;
3239}
Junio C Hamano2ae1c532006-02-27 14:47:45 -08003240
Johannes Schindelincd554bb2007-01-21 02:17:19 +01003241int cmd_apply(int argc, const char **argv, const char *unused_prefix)
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003242{
3243 int i;
Junio C Hamano57dc3972006-08-16 17:55:29 -07003244 int errs = 0;
SZEDER Gáboraf05d672008-03-25 22:06:26 +01003245 int is_not_gitdir;
Miklos Vajnaf26c4942008-12-28 00:03:57 +01003246 int binary;
3247 int force_apply = 0;
Johannes Schindelin3eaa38d2006-06-24 22:10:11 +02003248
Junio C Hamano2ae1c532006-02-27 14:47:45 -08003249 const char *whitespace_option = NULL;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003250
Miklos Vajnaf26c4942008-12-28 00:03:57 +01003251 struct option builtin_apply_options[] = {
Miklos Vajnaf26c4942008-12-28 00:03:57 +01003252 { OPTION_CALLBACK, 0, "exclude", NULL, "path",
Michele Ballabio40bac152009-03-18 19:05:39 +01003253 "don't apply changes matching the given path",
Miklos Vajnaf26c4942008-12-28 00:03:57 +01003254 0, option_parse_exclude },
3255 { OPTION_CALLBACK, 0, "include", NULL, "path",
3256 "apply changes matching the given path",
3257 0, option_parse_include },
3258 { OPTION_CALLBACK, 'p', NULL, NULL, "num",
3259 "remove <num> leading slashes from traditional diff paths",
3260 0, option_parse_p },
3261 OPT_BOOLEAN(0, "no-add", &no_add,
3262 "ignore additions made by the patch"),
3263 OPT_BOOLEAN(0, "stat", &diffstat,
3264 "instead of applying the patch, output diffstat for the input"),
Michele Ballabio092927c2009-03-18 19:05:40 +01003265 { OPTION_BOOLEAN, 0, "allow-binary-replacement", &binary,
3266 NULL, "old option, now no-op", PARSE_OPT_HIDDEN },
3267 { OPTION_BOOLEAN, 0, "binary", &binary,
3268 NULL, "old option, now no-op", PARSE_OPT_HIDDEN },
Miklos Vajnaf26c4942008-12-28 00:03:57 +01003269 OPT_BOOLEAN(0, "numstat", &numstat,
3270 "shows number of added and deleted lines in decimal notation"),
3271 OPT_BOOLEAN(0, "summary", &summary,
3272 "instead of applying the patch, output a summary for the input"),
3273 OPT_BOOLEAN(0, "check", &check,
3274 "instead of applying the patch, see if the patch is applicable"),
3275 OPT_BOOLEAN(0, "index", &check_index,
3276 "make sure the patch is applicable to the current index"),
3277 OPT_BOOLEAN(0, "cached", &cached,
3278 "apply a patch without touching the working tree"),
3279 OPT_BOOLEAN(0, "apply", &force_apply,
3280 "also apply the patch (use with --stat/--summary/--check)"),
3281 OPT_STRING(0, "build-fake-ancestor", &fake_ancestor, "file",
3282 "build a temporary index based on embedded index information"),
3283 { OPTION_CALLBACK, 'z', NULL, NULL, NULL,
3284 "paths are separated with NUL character",
3285 PARSE_OPT_NOARG, option_parse_z },
3286 OPT_INTEGER('C', NULL, &p_context,
3287 "ensure at least <n> lines of context match"),
3288 { OPTION_CALLBACK, 0, "whitespace", &whitespace_option, "action",
3289 "detect new or modified lines that have whitespace errors",
3290 0, option_parse_whitespace },
3291 OPT_BOOLEAN('R', "reverse", &apply_in_reverse,
3292 "apply the patch in reverse"),
3293 OPT_BOOLEAN(0, "unidiff-zero", &unidiff_zero,
3294 "don't expect at least one line of context"),
3295 OPT_BOOLEAN(0, "reject", &apply_with_reject,
3296 "leave the rejected hunks in corresponding *.rej files"),
3297 OPT__VERBOSE(&apply_verbosely),
3298 OPT_BIT(0, "inaccurate-eof", &options,
3299 "tolerate incorrectly detected missing new-line at the end of file",
3300 INACCURATE_EOF),
3301 OPT_BIT(0, "recount", &options,
3302 "do not trust the line counts in the hunk headers",
3303 RECOUNT),
3304 { OPTION_CALLBACK, 0, "directory", NULL, "root",
3305 "prepend <root> to all filenames",
3306 0, option_parse_directory },
3307 OPT_END()
3308 };
3309
Junio C Hamanodc7b2432007-02-17 13:12:52 -08003310 prefix = setup_git_directory_gently(&is_not_gitdir);
3311 prefix_length = prefix ? strlen(prefix) : 0;
Johannes Schindelinef90d6d2008-05-14 18:46:53 +01003312 git_config(git_apply_config, NULL);
Junio C Hamano700ea472007-02-17 18:12:46 -08003313 if (apply_default_whitespace)
3314 parse_whitespace_option(apply_default_whitespace);
Junio C Hamano67160272007-02-17 12:37:25 -08003315
Miklos Vajnaf26c4942008-12-28 00:03:57 +01003316 argc = parse_options(argc, argv, builtin_apply_options,
3317 apply_usage, 0);
3318 if (apply_with_reject)
3319 apply = apply_verbosely = 1;
3320 if (!force_apply && (diffstat || numstat || summary || check || fake_ancestor))
3321 apply = 0;
3322 if (check_index && is_not_gitdir)
3323 die("--index outside a repository");
3324 if (cached) {
3325 if (is_not_gitdir)
3326 die("--cached outside a repository");
3327 check_index = 1;
3328 }
3329 for (i = 0; i < argc; i++) {
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003330 const char *arg = argv[i];
3331 int fd;
3332
3333 if (!strcmp(arg, "-")) {
Johannes Schindelinc14b9d12008-06-27 18:43:09 +01003334 errs |= apply_patch(0, "<stdin>", options);
Linus Torvalds4dfdbe12005-05-23 16:42:21 -07003335 read_stdin = 0;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003336 continue;
Junio C Hamano64912a62009-01-09 22:21:36 -08003337 } else if (0 < prefix_length)
Junio C Hamanoedf2e372005-11-25 23:14:15 -08003338 arg = prefix_filename(prefix, prefix_length, arg);
3339
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003340 fd = open(arg, O_RDONLY);
3341 if (fd < 0)
Alberto Bertogli1da16432008-04-14 12:30:27 -03003342 die("can't open patch '%s': %s", arg, strerror(errno));
Linus Torvalds4dfdbe12005-05-23 16:42:21 -07003343 read_stdin = 0;
Junio C Hamanof21d6722006-02-28 01:12:52 -08003344 set_default_whitespace_mode(whitespace_option);
Johannes Schindelinc14b9d12008-06-27 18:43:09 +01003345 errs |= apply_patch(fd, arg, options);
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003346 close(fd);
3347 }
Junio C Hamanof21d6722006-02-28 01:12:52 -08003348 set_default_whitespace_mode(whitespace_option);
Linus Torvalds4dfdbe12005-05-23 16:42:21 -07003349 if (read_stdin)
Johannes Schindelinc14b9d12008-06-27 18:43:09 +01003350 errs |= apply_patch(0, "<stdin>", options);
Junio C Hamanofc96b7c2006-02-27 14:16:30 -08003351 if (whitespace_error) {
3352 if (squelch_whitespace_errors &&
3353 squelch_whitespace_errors < whitespace_error) {
3354 int squelched =
3355 whitespace_error - squelch_whitespace_errors;
Miklos Vajnaeca2a8f2009-03-24 02:09:10 +01003356 warning("squelched %d "
3357 "whitespace error%s",
Junio C Hamanofc96b7c2006-02-27 14:16:30 -08003358 squelched,
3359 squelched == 1 ? "" : "s");
3360 }
Junio C Hamano81bf96b2007-11-23 02:37:03 -08003361 if (ws_error_action == die_on_ws_error)
Junio C Hamanoc94bf412007-06-02 19:55:54 -07003362 die("%d line%s add%s whitespace errors.",
Junio C Hamanofc96b7c2006-02-27 14:16:30 -08003363 whitespace_error,
3364 whitespace_error == 1 ? "" : "s",
3365 whitespace_error == 1 ? "s" : "");
Junio C Hamanod8c37942008-01-08 15:46:18 -08003366 if (applied_after_fixing_ws && apply)
Miklos Vajnaeca2a8f2009-03-24 02:09:10 +01003367 warning("%d line%s applied after"
3368 " fixing whitespace errors.",
Junio C Hamanoc94bf412007-06-02 19:55:54 -07003369 applied_after_fixing_ws,
3370 applied_after_fixing_ws == 1 ? "" : "s");
Junio C Hamanofc96b7c2006-02-27 14:16:30 -08003371 else if (whitespace_error)
Miklos Vajnaeca2a8f2009-03-24 02:09:10 +01003372 warning("%d line%s add%s whitespace errors.",
Junio C Hamanofc96b7c2006-02-27 14:16:30 -08003373 whitespace_error,
3374 whitespace_error == 1 ? "" : "s",
3375 whitespace_error == 1 ? "s" : "");
3376 }
Eric Wongdbd0f7d2006-05-09 01:08:23 -07003377
Junio C Hamano7da3bf32007-04-01 22:46:06 -07003378 if (update_index) {
Eric Wongdbd0f7d2006-05-09 01:08:23 -07003379 if (write_cache(newfd, active_cache, active_nr) ||
Brandon Casey4ed7cd32008-01-16 13:12:46 -06003380 commit_locked_index(&lock_file))
Junio C Hamano021b6e42006-06-06 12:51:49 -07003381 die("Unable to write new index file");
Eric Wongdbd0f7d2006-05-09 01:08:23 -07003382 }
3383
Junio C Hamano57dc3972006-08-16 17:55:29 -07003384 return !!errs;
Linus Torvaldsc1bb9352005-05-23 10:52:17 -07003385}