]>
Commit | Line | Data |
---|---|---|
be3cfa85 JH |
1 | /* |
2 | * Copyright (C) 2005 Junio C Hamano | |
3 | */ | |
4 | #include <sys/types.h> | |
5 | #include <sys/wait.h> | |
532149d7 | 6 | #include <signal.h> |
86436c28 | 7 | #include "cache.h" |
6fb737be | 8 | #include "quote.h" |
86436c28 | 9 | #include "diff.h" |
427dcb4b | 10 | #include "diffcore.h" |
86436c28 | 11 | |
d19938ab | 12 | static const char *diff_opts = "-pu"; |
5c97558c | 13 | static unsigned char null_sha1[20] = { 0, }; |
427dcb4b | 14 | |
427dcb4b | 15 | static int reverse_diff; |
f0c6b2a2 | 16 | static int use_size_cache; |
86436c28 | 17 | |
be3cfa85 | 18 | static const char *external_diff(void) |
86436c28 | 19 | { |
d19938ab | 20 | static const char *external_diff_cmd = NULL; |
be3cfa85 JH |
21 | static int done_preparing = 0; |
22 | ||
23 | if (done_preparing) | |
24 | return external_diff_cmd; | |
25 | ||
86436c28 JH |
26 | /* |
27 | * Default values above are meant to match the | |
28 | * Linux kernel development style. Examples of | |
29 | * alternative styles you can specify via environment | |
30 | * variables are: | |
31 | * | |
86436c28 JH |
32 | * GIT_DIFF_OPTS="-c"; |
33 | */ | |
d19938ab JH |
34 | if (gitenv("GIT_EXTERNAL_DIFF")) |
35 | external_diff_cmd = gitenv("GIT_EXTERNAL_DIFF"); | |
be3cfa85 JH |
36 | |
37 | /* In case external diff fails... */ | |
d19938ab | 38 | diff_opts = gitenv("GIT_DIFF_OPTS") ? : diff_opts; |
be3cfa85 JH |
39 | |
40 | done_preparing = 1; | |
41 | return external_diff_cmd; | |
86436c28 JH |
42 | } |
43 | ||
be3cfa85 | 44 | static struct diff_tempfile { |
427dcb4b | 45 | const char *name; /* filename external diff should read from */ |
be3cfa85 JH |
46 | char hex[41]; |
47 | char mode[10]; | |
48 | char tmp_path[50]; | |
49 | } diff_temp[2]; | |
50 | ||
366175ef JH |
51 | static int count_lines(const char *filename) |
52 | { | |
53 | FILE *in; | |
54 | int count, ch, completely_empty = 1, nl_just_seen = 0; | |
55 | in = fopen(filename, "r"); | |
56 | count = 0; | |
57 | while ((ch = fgetc(in)) != EOF) | |
58 | if (ch == '\n') { | |
59 | count++; | |
60 | nl_just_seen = 1; | |
61 | completely_empty = 0; | |
62 | } | |
63 | else { | |
64 | nl_just_seen = 0; | |
65 | completely_empty = 0; | |
66 | } | |
67 | fclose(in); | |
68 | if (completely_empty) | |
69 | return 0; | |
70 | if (!nl_just_seen) | |
71 | count++; /* no trailing newline */ | |
72 | return count; | |
73 | } | |
74 | ||
75 | static void print_line_count(int count) | |
76 | { | |
77 | switch (count) { | |
78 | case 0: | |
79 | printf("0,0"); | |
80 | break; | |
81 | case 1: | |
82 | printf("1"); | |
83 | break; | |
84 | default: | |
85 | printf("1,%d", count); | |
86 | break; | |
87 | } | |
88 | } | |
89 | ||
90 | static void copy_file(int prefix, const char *filename) | |
91 | { | |
92 | FILE *in; | |
93 | int ch, nl_just_seen = 1; | |
94 | in = fopen(filename, "r"); | |
95 | while ((ch = fgetc(in)) != EOF) { | |
96 | if (nl_just_seen) | |
97 | putchar(prefix); | |
98 | putchar(ch); | |
99 | if (ch == '\n') | |
100 | nl_just_seen = 1; | |
101 | else | |
102 | nl_just_seen = 0; | |
103 | } | |
104 | fclose(in); | |
105 | if (!nl_just_seen) | |
106 | printf("\n\\ No newline at end of file\n"); | |
107 | } | |
108 | ||
109 | static void emit_rewrite_diff(const char *name_a, | |
110 | const char *name_b, | |
111 | struct diff_tempfile *temp) | |
112 | { | |
113 | /* Use temp[i].name as input, name_a and name_b as labels */ | |
114 | int lc_a, lc_b; | |
115 | lc_a = count_lines(temp[0].name); | |
116 | lc_b = count_lines(temp[1].name); | |
117 | printf("--- %s\n+++ %s\n@@ -", name_a, name_b); | |
118 | print_line_count(lc_a); | |
119 | printf(" +"); | |
120 | print_line_count(lc_b); | |
121 | printf(" @@\n"); | |
122 | if (lc_a) | |
123 | copy_file('-', temp[0].name); | |
124 | if (lc_b) | |
125 | copy_file('+', temp[1].name); | |
126 | } | |
127 | ||
915838c3 JH |
128 | static void builtin_diff(const char *name_a, |
129 | const char *name_b, | |
57fe64a4 | 130 | struct diff_tempfile *temp, |
366175ef JH |
131 | const char *xfrm_msg, |
132 | int complete_rewrite) | |
86436c28 | 133 | { |
9669e17a | 134 | int i, next_at, cmd_size; |
6fb737be JH |
135 | const char *diff_cmd = "diff -L%s%s -L%s%s"; |
136 | const char *diff_arg = "%s %s||:"; /* "||:" is to return 0 */ | |
2f978138 JH |
137 | const char *input_name_sq[2]; |
138 | const char *path0[2]; | |
139 | const char *path1[2]; | |
915838c3 | 140 | const char *name_sq[2]; |
2f978138 | 141 | char *cmd; |
915838c3 | 142 | |
6fb737be JH |
143 | name_sq[0] = sq_quote(name_a); |
144 | name_sq[1] = sq_quote(name_b); | |
915838c3 | 145 | |
c983370e JH |
146 | /* diff_cmd and diff_arg have 6 %s in total which makes |
147 | * the sum of these strings 12 bytes larger than required. | |
be3cfa85 | 148 | * we use 2 spaces around diff-opts, and we need to count |
c983370e | 149 | * terminating NUL, so we subtract 9 here. |
be3cfa85 | 150 | */ |
9669e17a | 151 | cmd_size = (strlen(diff_cmd) + strlen(diff_opts) + |
c983370e | 152 | strlen(diff_arg) - 9); |
2f978138 | 153 | for (i = 0; i < 2; i++) { |
6fb737be | 154 | input_name_sq[i] = sq_quote(temp[i].name); |
2f978138 JH |
155 | if (!strcmp(temp[i].name, "/dev/null")) { |
156 | path0[i] = "/dev/null"; | |
157 | path1[i] = ""; | |
2f978138 | 158 | } else { |
0980d9b3 | 159 | path0[i] = i ? "b/" : "a/"; |
915838c3 | 160 | path1[i] = name_sq[i]; |
2f978138 JH |
161 | } |
162 | cmd_size += (strlen(path0[i]) + strlen(path1[i]) + | |
c983370e | 163 | strlen(input_name_sq[i])); |
2f978138 | 164 | } |
be3cfa85 | 165 | |
2f978138 JH |
166 | cmd = xmalloc(cmd_size); |
167 | ||
168 | next_at = 0; | |
be3cfa85 | 169 | next_at += snprintf(cmd+next_at, cmd_size-next_at, |
2f978138 | 170 | diff_cmd, |
c983370e | 171 | path0[0], path1[0], path0[1], path1[1]); |
be3cfa85 JH |
172 | next_at += snprintf(cmd+next_at, cmd_size-next_at, |
173 | " %s ", diff_opts); | |
174 | next_at += snprintf(cmd+next_at, cmd_size-next_at, | |
2f978138 JH |
175 | diff_arg, input_name_sq[0], input_name_sq[1]); |
176 | ||
915838c3 | 177 | printf("diff --git a/%s b/%s\n", name_a, name_b); |
70aadac0 | 178 | if (!path1[0][0]) { |
b58f23b3 | 179 | printf("new file mode %s\n", temp[1].mode); |
70aadac0 JH |
180 | if (xfrm_msg && xfrm_msg[0]) |
181 | puts(xfrm_msg); | |
182 | } | |
183 | else if (!path1[1][0]) { | |
b58f23b3 | 184 | printf("deleted file mode %s\n", temp[0].mode); |
70aadac0 JH |
185 | if (xfrm_msg && xfrm_msg[0]) |
186 | puts(xfrm_msg); | |
187 | } | |
273b9834 | 188 | else { |
b58f23b3 JH |
189 | if (strcmp(temp[0].mode, temp[1].mode)) { |
190 | printf("old mode %s\n", temp[0].mode); | |
191 | printf("new mode %s\n", temp[1].mode); | |
192 | } | |
427dcb4b | 193 | if (xfrm_msg && xfrm_msg[0]) |
09d9d1a6 | 194 | puts(xfrm_msg); |
273b9834 JH |
195 | if (strncmp(temp[0].mode, temp[1].mode, 3)) |
196 | /* we do not run diff between different kind | |
197 | * of objects. | |
198 | */ | |
b28858bf | 199 | exit(0); |
366175ef JH |
200 | if (complete_rewrite) { |
201 | fflush(NULL); | |
202 | emit_rewrite_diff(name_a, name_b, temp); | |
203 | exit(0); | |
204 | } | |
b28858bf | 205 | } |
c983370e | 206 | fflush(NULL); |
be3cfa85 | 207 | execlp("/bin/sh","sh", "-c", cmd, NULL); |
86436c28 JH |
208 | } |
209 | ||
427dcb4b JH |
210 | struct diff_filespec *alloc_filespec(const char *path) |
211 | { | |
212 | int namelen = strlen(path); | |
213 | struct diff_filespec *spec = xmalloc(sizeof(*spec) + namelen + 1); | |
214 | spec->path = (char *)(spec + 1); | |
215 | strcpy(spec->path, path); | |
81e50eab | 216 | spec->should_free = spec->should_munmap = 0; |
427dcb4b JH |
217 | spec->xfrm_flags = 0; |
218 | spec->size = 0; | |
09d74b3b | 219 | spec->data = NULL; |
81e50eab JH |
220 | spec->mode = 0; |
221 | memset(spec->sha1, 0, 20); | |
427dcb4b JH |
222 | return spec; |
223 | } | |
224 | ||
225 | void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1, | |
226 | unsigned short mode) | |
227 | { | |
4130b995 JH |
228 | if (mode) { |
229 | spec->mode = DIFF_FILE_CANON_MODE(mode); | |
81e50eab JH |
230 | memcpy(spec->sha1, sha1, 20); |
231 | spec->sha1_valid = !!memcmp(sha1, null_sha1, 20); | |
232 | } | |
427dcb4b JH |
233 | } |
234 | ||
b46f0b6d JH |
235 | /* |
236 | * Given a name and sha1 pair, if the dircache tells us the file in | |
237 | * the work tree has that object contents, return true, so that | |
238 | * prepare_temp_file() does not have to inflate and extract. | |
239 | */ | |
240 | static int work_tree_matches(const char *name, const unsigned char *sha1) | |
241 | { | |
242 | struct cache_entry *ce; | |
243 | struct stat st; | |
244 | int pos, len; | |
5c97558c | 245 | |
b46f0b6d JH |
246 | /* We do not read the cache ourselves here, because the |
247 | * benchmark with my previous version that always reads cache | |
248 | * shows that it makes things worse for diff-tree comparing | |
249 | * two linux-2.6 kernel trees in an already checked out work | |
915838c3 | 250 | * tree. This is because most diff-tree comparisons deal with |
b46f0b6d JH |
251 | * only a small number of files, while reading the cache is |
252 | * expensive for a large project, and its cost outweighs the | |
253 | * savings we get by not inflating the object to a temporary | |
254 | * file. Practically, this code only helps when we are used | |
255 | * by diff-cache --cached, which does read the cache before | |
256 | * calling us. | |
57fe64a4 | 257 | */ |
b46f0b6d JH |
258 | if (!active_cache) |
259 | return 0; | |
260 | ||
261 | len = strlen(name); | |
262 | pos = cache_name_pos(name, len); | |
263 | if (pos < 0) | |
264 | return 0; | |
265 | ce = active_cache[pos]; | |
b28858bf | 266 | if ((lstat(name, &st) < 0) || |
427dcb4b | 267 | !S_ISREG(st.st_mode) || /* careful! */ |
5d728c84 | 268 | ce_match_stat(ce, &st) || |
b46f0b6d JH |
269 | memcmp(sha1, ce->sha1, 20)) |
270 | return 0; | |
427dcb4b JH |
271 | /* we return 1 only when we can stat, it is a regular file, |
272 | * stat information matches, and sha1 recorded in the cache | |
273 | * matches. I.e. we know the file in the work tree really is | |
274 | * the same as the <name, sha1> pair. | |
275 | */ | |
b46f0b6d JH |
276 | return 1; |
277 | } | |
278 | ||
f0c6b2a2 JH |
279 | static struct sha1_size_cache { |
280 | unsigned char sha1[20]; | |
281 | unsigned long size; | |
282 | } **sha1_size_cache; | |
283 | static int sha1_size_cache_nr, sha1_size_cache_alloc; | |
284 | ||
285 | static struct sha1_size_cache *locate_size_cache(unsigned char *sha1, | |
0601e131 | 286 | int find_only, |
f0c6b2a2 JH |
287 | unsigned long size) |
288 | { | |
289 | int first, last; | |
290 | struct sha1_size_cache *e; | |
291 | ||
292 | first = 0; | |
293 | last = sha1_size_cache_nr; | |
294 | while (last > first) { | |
0601e131 | 295 | int cmp, next = (last + first) >> 1; |
f0c6b2a2 | 296 | e = sha1_size_cache[next]; |
0601e131 | 297 | cmp = memcmp(e->sha1, sha1, 20); |
f0c6b2a2 JH |
298 | if (!cmp) |
299 | return e; | |
300 | if (cmp < 0) { | |
301 | last = next; | |
302 | continue; | |
303 | } | |
304 | first = next+1; | |
305 | } | |
306 | /* not found */ | |
0601e131 | 307 | if (find_only) |
f0c6b2a2 JH |
308 | return NULL; |
309 | /* insert to make it at "first" */ | |
310 | if (sha1_size_cache_alloc <= sha1_size_cache_nr) { | |
311 | sha1_size_cache_alloc = alloc_nr(sha1_size_cache_alloc); | |
312 | sha1_size_cache = xrealloc(sha1_size_cache, | |
313 | sha1_size_cache_alloc * | |
314 | sizeof(*sha1_size_cache)); | |
315 | } | |
316 | sha1_size_cache_nr++; | |
317 | if (first < sha1_size_cache_nr) | |
318 | memmove(sha1_size_cache + first + 1, sha1_size_cache + first, | |
319 | (sha1_size_cache_nr - first - 1) * | |
320 | sizeof(*sha1_size_cache)); | |
321 | e = xmalloc(sizeof(struct sha1_size_cache)); | |
322 | sha1_size_cache[first] = e; | |
323 | memcpy(e->sha1, sha1, 20); | |
324 | e->size = size; | |
325 | return e; | |
326 | } | |
327 | ||
427dcb4b JH |
328 | /* |
329 | * While doing rename detection and pickaxe operation, we may need to | |
330 | * grab the data for the blob (or file) for our own in-core comparison. | |
331 | * diff_filespec has data and size fields for this purpose. | |
332 | */ | |
f0c6b2a2 | 333 | int diff_populate_filespec(struct diff_filespec *s, int size_only) |
427dcb4b JH |
334 | { |
335 | int err = 0; | |
81e50eab | 336 | if (!DIFF_FILE_VALID(s)) |
427dcb4b JH |
337 | die("internal error: asking to populate invalid file."); |
338 | if (S_ISDIR(s->mode)) | |
339 | return -1; | |
340 | ||
f0c6b2a2 JH |
341 | if (!use_size_cache) |
342 | size_only = 0; | |
343 | ||
427dcb4b JH |
344 | if (s->data) |
345 | return err; | |
346 | if (!s->sha1_valid || | |
347 | work_tree_matches(s->path, s->sha1)) { | |
348 | struct stat st; | |
349 | int fd; | |
350 | if (lstat(s->path, &st) < 0) { | |
351 | if (errno == ENOENT) { | |
352 | err_empty: | |
353 | err = -1; | |
354 | empty: | |
355 | s->data = ""; | |
356 | s->size = 0; | |
357 | return err; | |
358 | } | |
359 | } | |
360 | s->size = st.st_size; | |
361 | if (!s->size) | |
362 | goto empty; | |
f0c6b2a2 JH |
363 | if (size_only) |
364 | return 0; | |
427dcb4b JH |
365 | if (S_ISLNK(st.st_mode)) { |
366 | int ret; | |
367 | s->data = xmalloc(s->size); | |
368 | s->should_free = 1; | |
369 | ret = readlink(s->path, s->data, s->size); | |
370 | if (ret < 0) { | |
371 | free(s->data); | |
372 | goto err_empty; | |
373 | } | |
374 | return 0; | |
375 | } | |
376 | fd = open(s->path, O_RDONLY); | |
377 | if (fd < 0) | |
378 | goto err_empty; | |
379 | s->data = mmap(NULL, s->size, PROT_READ, MAP_PRIVATE, fd, 0); | |
380 | s->should_munmap = 1; | |
381 | close(fd); | |
382 | } | |
383 | else { | |
384 | char type[20]; | |
f0c6b2a2 JH |
385 | struct sha1_size_cache *e; |
386 | ||
387 | if (size_only) { | |
0601e131 | 388 | e = locate_size_cache(s->sha1, 1, 0); |
f0c6b2a2 JH |
389 | if (e) { |
390 | s->size = e->size; | |
391 | return 0; | |
392 | } | |
36e4d74a | 393 | if (!sha1_object_info(s->sha1, type, &s->size)) |
0601e131 | 394 | locate_size_cache(s->sha1, 0, s->size); |
65c2e0c3 JH |
395 | } |
396 | else { | |
397 | s->data = read_sha1_file(s->sha1, type, &s->size); | |
398 | s->should_free = 1; | |
f0c6b2a2 | 399 | } |
427dcb4b JH |
400 | } |
401 | return 0; | |
402 | } | |
403 | ||
404 | void diff_free_filespec_data(struct diff_filespec *s) | |
405 | { | |
406 | if (s->should_free) | |
407 | free(s->data); | |
408 | else if (s->should_munmap) | |
409 | munmap(s->data, s->size); | |
410 | s->should_free = s->should_munmap = 0; | |
09d74b3b | 411 | s->data = NULL; |
427dcb4b JH |
412 | } |
413 | ||
b28858bf JH |
414 | static void prep_temp_blob(struct diff_tempfile *temp, |
415 | void *blob, | |
416 | unsigned long size, | |
417 | unsigned char *sha1, | |
418 | int mode) | |
419 | { | |
420 | int fd; | |
421 | ||
422 | strcpy(temp->tmp_path, ".diff_XXXXXX"); | |
423 | fd = mkstemp(temp->tmp_path); | |
424 | if (fd < 0) | |
425 | die("unable to create temp-file"); | |
426 | if (write(fd, blob, size) != size) | |
427 | die("unable to write temp-file"); | |
428 | close(fd); | |
429 | temp->name = temp->tmp_path; | |
430 | strcpy(temp->hex, sha1_to_hex(sha1)); | |
431 | temp->hex[40] = 0; | |
432 | sprintf(temp->mode, "%06o", mode); | |
433 | } | |
434 | ||
be3cfa85 JH |
435 | static void prepare_temp_file(const char *name, |
436 | struct diff_tempfile *temp, | |
427dcb4b | 437 | struct diff_filespec *one) |
86436c28 | 438 | { |
81e50eab | 439 | if (!DIFF_FILE_VALID(one)) { |
be3cfa85 | 440 | not_a_valid_file: |
532149d7 JH |
441 | /* A '-' entry produces this for file-2, and |
442 | * a '+' entry produces this for file-1. | |
443 | */ | |
be3cfa85 JH |
444 | temp->name = "/dev/null"; |
445 | strcpy(temp->hex, "."); | |
446 | strcpy(temp->mode, "."); | |
86436c28 JH |
447 | return; |
448 | } | |
be3cfa85 | 449 | |
5c97558c | 450 | if (!one->sha1_valid || |
427dcb4b | 451 | work_tree_matches(name, one->sha1)) { |
be3cfa85 | 452 | struct stat st; |
427dcb4b | 453 | if (lstat(name, &st) < 0) { |
be3cfa85 JH |
454 | if (errno == ENOENT) |
455 | goto not_a_valid_file; | |
427dcb4b | 456 | die("stat(%s): %s", name, strerror(errno)); |
be3cfa85 | 457 | } |
b28858bf JH |
458 | if (S_ISLNK(st.st_mode)) { |
459 | int ret; | |
460 | char *buf, buf_[1024]; | |
461 | buf = ((sizeof(buf_) < st.st_size) ? | |
462 | xmalloc(st.st_size) : buf_); | |
463 | ret = readlink(name, buf, st.st_size); | |
464 | if (ret < 0) | |
465 | die("readlink(%s)", name); | |
466 | prep_temp_blob(temp, buf, st.st_size, | |
467 | (one->sha1_valid ? | |
427dcb4b | 468 | one->sha1 : null_sha1), |
b28858bf JH |
469 | (one->sha1_valid ? |
470 | one->mode : S_IFLNK)); | |
471 | } | |
472 | else { | |
427dcb4b JH |
473 | /* we can borrow from the file in the work tree */ |
474 | temp->name = name; | |
b28858bf JH |
475 | if (!one->sha1_valid) |
476 | strcpy(temp->hex, sha1_to_hex(null_sha1)); | |
477 | else | |
427dcb4b | 478 | strcpy(temp->hex, sha1_to_hex(one->sha1)); |
9d429ff6 JH |
479 | /* Even though we may sometimes borrow the |
480 | * contents from the work tree, we always want | |
481 | * one->mode. mode is trustworthy even when | |
482 | * !(one->sha1_valid), as long as | |
483 | * DIFF_FILE_VALID(one). | |
484 | */ | |
485 | sprintf(temp->mode, "%06o", one->mode); | |
b28858bf JH |
486 | } |
487 | return; | |
be3cfa85 JH |
488 | } |
489 | else { | |
f0c6b2a2 | 490 | if (diff_populate_filespec(one, 0)) |
427dcb4b JH |
491 | die("cannot read data blob for %s", one->path); |
492 | prep_temp_blob(temp, one->data, one->size, | |
493 | one->sha1, one->mode); | |
be3cfa85 JH |
494 | } |
495 | } | |
496 | ||
497 | static void remove_tempfile(void) | |
498 | { | |
499 | int i; | |
500 | ||
501 | for (i = 0; i < 2; i++) | |
502 | if (diff_temp[i].name == diff_temp[i].tmp_path) { | |
503 | unlink(diff_temp[i].name); | |
504 | diff_temp[i].name = NULL; | |
505 | } | |
506 | } | |
507 | ||
532149d7 JH |
508 | static void remove_tempfile_on_signal(int signo) |
509 | { | |
510 | remove_tempfile(); | |
511 | } | |
512 | ||
be3cfa85 JH |
513 | /* An external diff command takes: |
514 | * | |
515 | * diff-cmd name infile1 infile1-sha1 infile1-mode \ | |
5c97558c | 516 | * infile2 infile2-sha1 infile2-mode [ rename-to ] |
be3cfa85 JH |
517 | * |
518 | */ | |
4130b995 JH |
519 | static void run_external_diff(const char *pgm, |
520 | const char *name, | |
5c97558c | 521 | const char *other, |
427dcb4b JH |
522 | struct diff_filespec *one, |
523 | struct diff_filespec *two, | |
366175ef JH |
524 | const char *xfrm_msg, |
525 | int complete_rewrite) | |
be3cfa85 JH |
526 | { |
527 | struct diff_tempfile *temp = diff_temp; | |
532149d7 JH |
528 | pid_t pid; |
529 | int status; | |
be3cfa85 JH |
530 | static int atexit_asked = 0; |
531 | ||
77eb2720 JH |
532 | if (one && two) { |
533 | prepare_temp_file(name, &temp[0], one); | |
915838c3 | 534 | prepare_temp_file(other ? : name, &temp[1], two); |
77eb2720 JH |
535 | if (! atexit_asked && |
536 | (temp[0].name == temp[0].tmp_path || | |
537 | temp[1].name == temp[1].tmp_path)) { | |
538 | atexit_asked = 1; | |
539 | atexit(remove_tempfile); | |
540 | } | |
532149d7 | 541 | signal(SIGINT, remove_tempfile_on_signal); |
be3cfa85 JH |
542 | } |
543 | ||
544 | fflush(NULL); | |
545 | pid = fork(); | |
546 | if (pid < 0) | |
547 | die("unable to fork"); | |
548 | if (!pid) { | |
5c97558c JH |
549 | if (pgm) { |
550 | if (one && two) { | |
427dcb4b | 551 | const char *exec_arg[10]; |
5c97558c JH |
552 | const char **arg = &exec_arg[0]; |
553 | *arg++ = pgm; | |
554 | *arg++ = name; | |
555 | *arg++ = temp[0].name; | |
556 | *arg++ = temp[0].hex; | |
557 | *arg++ = temp[0].mode; | |
558 | *arg++ = temp[1].name; | |
559 | *arg++ = temp[1].hex; | |
560 | *arg++ = temp[1].mode; | |
427dcb4b | 561 | if (other) { |
5c97558c | 562 | *arg++ = other; |
427dcb4b JH |
563 | *arg++ = xfrm_msg; |
564 | } | |
09d74b3b | 565 | *arg = NULL; |
5c97558c JH |
566 | execvp(pgm, (char *const*) exec_arg); |
567 | } | |
77eb2720 JH |
568 | else |
569 | execlp(pgm, pgm, name, NULL); | |
570 | } | |
be3cfa85 JH |
571 | /* |
572 | * otherwise we use the built-in one. | |
573 | */ | |
77eb2720 | 574 | if (one && two) |
366175ef JH |
575 | builtin_diff(name, other ? : name, temp, xfrm_msg, |
576 | complete_rewrite); | |
77eb2720 JH |
577 | else |
578 | printf("* Unmerged path %s\n", name); | |
be3cfa85 JH |
579 | exit(0); |
580 | } | |
6fa28064 JH |
581 | if (waitpid(pid, &status, 0) < 0 || |
582 | !WIFEXITED(status) || WEXITSTATUS(status)) { | |
583 | /* Earlier we did not check the exit status because | |
532149d7 | 584 | * diff exits non-zero if files are different, and |
6fa28064 JH |
585 | * we are not interested in knowing that. It was a |
586 | * mistake which made it harder to quit a diff-* | |
587 | * session that uses the git-apply-patch-script as | |
588 | * the GIT_EXTERNAL_DIFF. A custom GIT_EXTERNAL_DIFF | |
589 | * should also exit non-zero only when it wants to | |
590 | * abort the entire diff-* session. | |
532149d7 JH |
591 | */ |
592 | remove_tempfile(); | |
6fa28064 JH |
593 | fprintf(stderr, "external diff died, stopping at %s.\n", name); |
594 | exit(1); | |
532149d7 | 595 | } |
be3cfa85 JH |
596 | remove_tempfile(); |
597 | } | |
598 | ||
366175ef | 599 | static void run_diff(struct diff_filepair *p) |
4130b995 JH |
600 | { |
601 | const char *pgm = external_diff(); | |
366175ef JH |
602 | char msg_[PATH_MAX*2+200], *xfrm_msg; |
603 | struct diff_filespec *one; | |
604 | struct diff_filespec *two; | |
605 | const char *name; | |
606 | const char *other; | |
607 | int complete_rewrite = 0; | |
608 | ||
609 | if (DIFF_PAIR_UNMERGED(p)) { | |
610 | /* unmerged */ | |
611 | run_external_diff(pgm, p->one->path, NULL, NULL, NULL, NULL, | |
612 | 0); | |
613 | return; | |
614 | } | |
615 | ||
616 | name = p->one->path; | |
617 | other = (strcmp(name, p->two->path) ? p->two->path : NULL); | |
618 | one = p->one; two = p->two; | |
619 | switch (p->status) { | |
620 | case 'C': | |
621 | sprintf(msg_, | |
622 | "similarity index %d%%\n" | |
623 | "copy from %s\n" | |
624 | "copy to %s", | |
625 | (int)(0.5 + p->score * 100.0/MAX_SCORE), | |
626 | name, other); | |
627 | xfrm_msg = msg_; | |
628 | break; | |
629 | case 'R': | |
630 | sprintf(msg_, | |
631 | "similarity index %d%%\n" | |
632 | "rename from %s\n" | |
633 | "rename to %s", | |
634 | (int)(0.5 + p->score * 100.0/MAX_SCORE), | |
635 | name, other); | |
636 | xfrm_msg = msg_; | |
637 | break; | |
638 | case 'M': | |
639 | if (p->score) { | |
640 | sprintf(msg_, | |
641 | "dissimilarity index %d%%", | |
642 | (int)(0.5 + p->score * 100.0/MAX_SCORE)); | |
643 | xfrm_msg = msg_; | |
644 | complete_rewrite = 1; | |
645 | break; | |
646 | } | |
647 | /* fallthru */ | |
648 | default: | |
649 | xfrm_msg = NULL; | |
650 | } | |
651 | ||
4130b995 JH |
652 | if (!pgm && |
653 | DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) && | |
654 | (S_IFMT & one->mode) != (S_IFMT & two->mode)) { | |
655 | /* a filepair that changes between file and symlink | |
656 | * needs to be split into deletion and creation. | |
657 | */ | |
658 | struct diff_filespec *null = alloc_filespec(two->path); | |
366175ef | 659 | run_external_diff(NULL, name, other, one, null, xfrm_msg, 0); |
4130b995 JH |
660 | free(null); |
661 | null = alloc_filespec(one->path); | |
366175ef | 662 | run_external_diff(NULL, name, other, null, two, xfrm_msg, 0); |
4130b995 JH |
663 | free(null); |
664 | } | |
665 | else | |
366175ef JH |
666 | run_external_diff(pgm, name, other, one, two, xfrm_msg, |
667 | complete_rewrite); | |
4130b995 JH |
668 | } |
669 | ||
19feebc8 | 670 | void diff_setup(int flags) |
5c97558c | 671 | { |
19feebc8 JH |
672 | if (flags & DIFF_SETUP_REVERSE) |
673 | reverse_diff = 1; | |
f0c6b2a2 JH |
674 | if (flags & DIFF_SETUP_USE_CACHE) { |
675 | if (!active_cache) | |
676 | /* read-cache does not die even when it fails | |
677 | * so it is safe for us to do this here. Also | |
678 | * it does not smudge active_cache or active_nr | |
679 | * when it fails, so we do not have to worry about | |
680 | * cleaning it up oufselves either. | |
681 | */ | |
682 | read_cache(); | |
683 | } | |
684 | if (flags & DIFF_SETUP_USE_SIZE_CACHE) | |
685 | use_size_cache = 1; | |
686 | ||
5c97558c JH |
687 | } |
688 | ||
0e3994fa JH |
689 | static int parse_num(const char **cp_p) |
690 | { | |
691 | int num, scale, ch, cnt; | |
692 | const char *cp = *cp_p; | |
693 | ||
694 | cnt = num = 0; | |
695 | scale = 1; | |
696 | while ('0' <= (ch = *cp) && ch <= '9') { | |
697 | if (cnt++ < 5) { | |
698 | /* We simply ignore more than 5 digits precision. */ | |
699 | scale *= 10; | |
700 | num = num * 10 + ch - '0'; | |
701 | } | |
702 | *cp++; | |
703 | } | |
704 | *cp_p = cp; | |
705 | ||
706 | /* user says num divided by scale and we say internally that | |
707 | * is MAX_SCORE * num / scale. | |
708 | */ | |
709 | return (MAX_SCORE * num / scale); | |
710 | } | |
711 | ||
712 | int diff_scoreopt_parse(const char *opt) | |
713 | { | |
eeaa4603 | 714 | int opt1, opt2, cmd; |
0e3994fa JH |
715 | |
716 | if (*opt++ != '-') | |
717 | return -1; | |
718 | cmd = *opt++; | |
719 | if (cmd != 'M' && cmd != 'C' && cmd != 'B') | |
720 | return -1; /* that is not a -M, -C nor -B option */ | |
721 | ||
722 | opt1 = parse_num(&opt); | |
eeaa4603 JH |
723 | if (cmd != 'B') |
724 | opt2 = 0; | |
725 | else { | |
726 | if (*opt == 0) | |
727 | opt2 = 0; | |
728 | else if (*opt != '/') | |
729 | return -1; /* we expect -B80/99 or -B80 */ | |
730 | else { | |
731 | opt++; | |
732 | opt2 = parse_num(&opt); | |
733 | } | |
734 | } | |
0e3994fa JH |
735 | if (*opt != 0) |
736 | return -1; | |
eeaa4603 | 737 | return opt1 | (opt2 << 16); |
0e3994fa JH |
738 | } |
739 | ||
6b14d7fa JH |
740 | struct diff_queue_struct diff_queued_diff; |
741 | ||
742 | void diff_q(struct diff_queue_struct *queue, struct diff_filepair *dp) | |
5c97558c | 743 | { |
6b14d7fa JH |
744 | if (queue->alloc <= queue->nr) { |
745 | queue->alloc = alloc_nr(queue->alloc); | |
746 | queue->queue = xrealloc(queue->queue, | |
747 | sizeof(dp) * queue->alloc); | |
81e50eab | 748 | } |
6b14d7fa | 749 | queue->queue[queue->nr++] = dp; |
5c97558c JH |
750 | } |
751 | ||
52e95789 | 752 | struct diff_filepair *diff_queue(struct diff_queue_struct *queue, |
6b14d7fa JH |
753 | struct diff_filespec *one, |
754 | struct diff_filespec *two) | |
5c97558c | 755 | { |
52e95789 | 756 | struct diff_filepair *dp = xmalloc(sizeof(*dp)); |
427dcb4b JH |
757 | dp->one = one; |
758 | dp->two = two; | |
f7c1512a | 759 | dp->score = 0; |
2210100a | 760 | dp->status = 0; |
15d061b4 | 761 | dp->source_stays = 0; |
f345b0a0 | 762 | dp->broken_pair = 0; |
6b14d7fa | 763 | diff_q(queue, dp); |
427dcb4b | 764 | return dp; |
5c97558c JH |
765 | } |
766 | ||
226406f6 JH |
767 | void diff_free_filepair(struct diff_filepair *p) |
768 | { | |
769 | diff_free_filespec_data(p->one); | |
770 | diff_free_filespec_data(p->two); | |
771 | free(p); | |
772 | } | |
773 | ||
bceafe75 JH |
774 | static void diff_flush_raw(struct diff_filepair *p, |
775 | int line_termination, | |
776 | int inter_name_termination) | |
5c97558c | 777 | { |
b6d8f309 JH |
778 | int two_paths; |
779 | char status[10]; | |
25d5ea41 JH |
780 | |
781 | if (line_termination) { | |
782 | const char *err = "path %s cannot be expressed without -z"; | |
783 | if (strchr(p->one->path, line_termination) || | |
784 | strchr(p->one->path, inter_name_termination)) | |
785 | die(err, p->one->path); | |
786 | if (strchr(p->two->path, line_termination) || | |
787 | strchr(p->two->path, inter_name_termination)) | |
788 | die(err, p->two->path); | |
789 | } | |
790 | ||
366175ef JH |
791 | if (p->score) |
792 | sprintf(status, "%c%03d", p->status, | |
793 | (int)(0.5 + p->score * 100.0/MAX_SCORE)); | |
794 | else { | |
795 | status[0] = p->status; | |
796 | status[1] = 0; | |
797 | } | |
b6d8f309 JH |
798 | switch (p->status) { |
799 | case 'C': case 'R': | |
800 | two_paths = 1; | |
b6d8f309 | 801 | break; |
f345b0a0 JH |
802 | case 'N': case 'D': |
803 | two_paths = 0; | |
f345b0a0 | 804 | break; |
b6d8f309 JH |
805 | default: |
806 | two_paths = 0; | |
b6d8f309 | 807 | break; |
6b14d7fa | 808 | } |
81e50eab JH |
809 | printf(":%06o %06o %s ", |
810 | p->one->mode, p->two->mode, sha1_to_hex(p->one->sha1)); | |
b6d8f309 JH |
811 | printf("%s %s%c%s", |
812 | sha1_to_hex(p->two->sha1), | |
813 | status, | |
814 | inter_name_termination, | |
815 | p->one->path); | |
816 | if (two_paths) | |
817 | printf("%c%s", inter_name_termination, p->two->path); | |
818 | putchar(line_termination); | |
5c97558c JH |
819 | } |
820 | ||
52f28529 JH |
821 | static void diff_flush_name(struct diff_filepair *p, |
822 | int line_termination) | |
823 | { | |
824 | printf("%s%c", p->two->path, line_termination); | |
825 | } | |
826 | ||
f7c1512a | 827 | int diff_unmodified_pair(struct diff_filepair *p) |
5c97558c | 828 | { |
427dcb4b JH |
829 | /* This function is written stricter than necessary to support |
830 | * the currently implemented transformers, but the idea is to | |
52e95789 | 831 | * let transformers to produce diff_filepairs any way they want, |
427dcb4b | 832 | * and filter and clean them up here before producing the output. |
5c97558c | 833 | */ |
6b14d7fa JH |
834 | struct diff_filespec *one, *two; |
835 | ||
836 | if (DIFF_PAIR_UNMERGED(p)) | |
837 | return 0; /* unmerged is interesting */ | |
5c97558c | 838 | |
6b14d7fa JH |
839 | one = p->one; |
840 | two = p->two; | |
5c97558c | 841 | |
4130b995 JH |
842 | /* deletion, addition, mode or type change |
843 | * and rename are all interesting. | |
844 | */ | |
81e50eab | 845 | if (DIFF_FILE_VALID(one) != DIFF_FILE_VALID(two) || |
4130b995 | 846 | DIFF_PAIR_MODE_CHANGED(p) || |
427dcb4b JH |
847 | strcmp(one->path, two->path)) |
848 | return 0; | |
57fe64a4 | 849 | |
427dcb4b JH |
850 | /* both are valid and point at the same path. that is, we are |
851 | * dealing with a change. | |
57fe64a4 | 852 | */ |
427dcb4b JH |
853 | if (one->sha1_valid && two->sha1_valid && |
854 | !memcmp(one->sha1, two->sha1, sizeof(one->sha1))) | |
855 | return 1; /* no change */ | |
856 | if (!one->sha1_valid && !two->sha1_valid) | |
857 | return 1; /* both look at the same file on the filesystem. */ | |
858 | return 0; | |
57fe64a4 JH |
859 | } |
860 | ||
b6d8f309 | 861 | static void diff_flush_patch(struct diff_filepair *p) |
f7c1512a | 862 | { |
f7c1512a JH |
863 | if (diff_unmodified_pair(p)) |
864 | return; | |
865 | ||
f7c1512a JH |
866 | if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) || |
867 | (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode))) | |
868 | return; /* no tree diffs in patch format */ | |
869 | ||
366175ef | 870 | run_diff(p); |
f7c1512a JH |
871 | } |
872 | ||
bceafe75 | 873 | int diff_queue_is_empty(void) |
f7c1512a | 874 | { |
bceafe75 | 875 | struct diff_queue_struct *q = &diff_queued_diff; |
25d5ea41 JH |
876 | int i; |
877 | for (i = 0; i < q->nr; i++) | |
878 | if (!diff_unmodified_pair(q->queue[i])) | |
879 | return 0; | |
880 | return 1; | |
f7c1512a JH |
881 | } |
882 | ||
25d5ea41 JH |
883 | #if DIFF_DEBUG |
884 | void diff_debug_filespec(struct diff_filespec *s, int x, const char *one) | |
885 | { | |
886 | fprintf(stderr, "queue[%d] %s (%s) %s %06o %s\n", | |
887 | x, one ? : "", | |
888 | s->path, | |
889 | DIFF_FILE_VALID(s) ? "valid" : "invalid", | |
890 | s->mode, | |
891 | s->sha1_valid ? sha1_to_hex(s->sha1) : ""); | |
892 | fprintf(stderr, "queue[%d] %s size %lu flags %d\n", | |
893 | x, one ? : "", | |
894 | s->size, s->xfrm_flags); | |
895 | } | |
896 | ||
897 | void diff_debug_filepair(const struct diff_filepair *p, int i) | |
898 | { | |
899 | diff_debug_filespec(p->one, i, "one"); | |
900 | diff_debug_filespec(p->two, i, "two"); | |
f345b0a0 JH |
901 | fprintf(stderr, "score %d, status %c stays %d broken %d\n", |
902 | p->score, p->status ? : '?', | |
903 | p->source_stays, p->broken_pair); | |
25d5ea41 JH |
904 | } |
905 | ||
906 | void diff_debug_queue(const char *msg, struct diff_queue_struct *q) | |
6b14d7fa | 907 | { |
6b14d7fa | 908 | int i; |
25d5ea41 JH |
909 | if (msg) |
910 | fprintf(stderr, "%s\n", msg); | |
911 | fprintf(stderr, "q->nr = %d\n", q->nr); | |
6b14d7fa JH |
912 | for (i = 0; i < q->nr; i++) { |
913 | struct diff_filepair *p = q->queue[i]; | |
25d5ea41 JH |
914 | diff_debug_filepair(p, i); |
915 | } | |
916 | } | |
917 | #endif | |
918 | ||
919 | static void diff_resolve_rename_copy(void) | |
920 | { | |
921 | int i, j; | |
922 | struct diff_filepair *p, *pp; | |
923 | struct diff_queue_struct *q = &diff_queued_diff; | |
924 | ||
25d5ea41 JH |
925 | diff_debug_queue("resolve-rename-copy", q); |
926 | ||
927 | for (i = 0; i < q->nr; i++) { | |
928 | p = q->queue[i]; | |
96716a19 | 929 | p->status = 0; /* undecided */ |
bceafe75 JH |
930 | if (DIFF_PAIR_UNMERGED(p)) |
931 | p->status = 'U'; | |
15d061b4 | 932 | else if (!DIFF_FILE_VALID(p->one)) |
bceafe75 | 933 | p->status = 'N'; |
2cd68882 JH |
934 | else if (!DIFF_FILE_VALID(p->two)) |
935 | p->status = 'D'; | |
96716a19 JH |
936 | else if (DIFF_PAIR_TYPE_CHANGED(p)) |
937 | p->status = 'T'; | |
938 | ||
939 | /* from this point on, we are dealing with a pair | |
940 | * whose both sides are valid and of the same type, i.e. | |
941 | * either in-place edit or rename/copy edit. | |
942 | */ | |
01c4e70f | 943 | else if (DIFF_PAIR_RENAME(p)) { |
15d061b4 JH |
944 | if (p->source_stays) { |
945 | p->status = 'C'; | |
946 | continue; | |
947 | } | |
948 | /* See if there is some other filepair that | |
949 | * copies from the same source as us. If so | |
950 | * we are a copy. Otherwise we are a rename. | |
25d5ea41 | 951 | */ |
15d061b4 | 952 | for (j = i + 1; j < q->nr; j++) { |
25d5ea41 JH |
953 | pp = q->queue[j]; |
954 | if (strcmp(pp->one->path, p->one->path)) | |
15d061b4 | 955 | continue; /* not us */ |
01c4e70f | 956 | if (!DIFF_PAIR_RENAME(pp)) |
15d061b4 JH |
957 | continue; /* not a rename/copy */ |
958 | /* pp is a rename/copy from the same source */ | |
959 | p->status = 'C'; | |
960 | break; | |
25d5ea41 JH |
961 | } |
962 | if (!p->status) | |
bceafe75 JH |
963 | p->status = 'R'; |
964 | } | |
9fdade06 JH |
965 | else if (memcmp(p->one->sha1, p->two->sha1, 20) || |
966 | p->one->mode != p->two->mode) | |
bceafe75 | 967 | p->status = 'M'; |
67574c40 JH |
968 | else { |
969 | /* This is a "no-change" entry and should not | |
970 | * happen anymore, but prepare for broken callers. | |
15d061b4 | 971 | */ |
67574c40 JH |
972 | error("feeding unmodified %s to diffcore", |
973 | p->one->path); | |
974 | p->status = 'X'; | |
975 | } | |
6b14d7fa | 976 | } |
25d5ea41 | 977 | diff_debug_queue("resolve-rename-copy done", q); |
38c6f780 JH |
978 | } |
979 | ||
f2ce9fde | 980 | void diff_flush(int diff_output_style) |
38c6f780 JH |
981 | { |
982 | struct diff_queue_struct *q = &diff_queued_diff; | |
983 | int i; | |
bceafe75 JH |
984 | int line_termination = '\n'; |
985 | int inter_name_termination = '\t'; | |
38c6f780 | 986 | |
52f28529 JH |
987 | if (diff_output_style == DIFF_FORMAT_MACHINE || |
988 | diff_output_style == DIFF_FORMAT_NAME_Z) | |
6b14d7fa | 989 | line_termination = inter_name_termination = 0; |
bceafe75 | 990 | |
f7c1512a | 991 | for (i = 0; i < q->nr; i++) { |
f7c1512a | 992 | struct diff_filepair *p = q->queue[i]; |
4130b995 JH |
993 | if ((diff_output_style == DIFF_FORMAT_NO_OUTPUT) || |
994 | (p->status == 'X')) | |
96716a19 | 995 | continue; |
bceafe75 | 996 | if (p->status == 0) |
96716a19 | 997 | die("internal error in diff-resolve-rename-copy"); |
bceafe75 JH |
998 | switch (diff_output_style) { |
999 | case DIFF_FORMAT_PATCH: | |
b6d8f309 | 1000 | diff_flush_patch(p); |
bceafe75 JH |
1001 | break; |
1002 | case DIFF_FORMAT_HUMAN: | |
1003 | case DIFF_FORMAT_MACHINE: | |
1004 | diff_flush_raw(p, line_termination, | |
1005 | inter_name_termination); | |
1006 | break; | |
52f28529 JH |
1007 | case DIFF_FORMAT_NAME: |
1008 | case DIFF_FORMAT_NAME_Z: | |
1009 | diff_flush_name(p, line_termination); | |
1010 | break; | |
bceafe75 | 1011 | } |
f7c1512a | 1012 | } |
226406f6 JH |
1013 | for (i = 0; i < q->nr; i++) |
1014 | diff_free_filepair(q->queue[i]); | |
427dcb4b JH |
1015 | free(q->queue); |
1016 | q->queue = NULL; | |
1017 | q->nr = q->alloc = 0; | |
5c97558c JH |
1018 | } |
1019 | ||
f2ce9fde JH |
1020 | static void diffcore_apply_filter(const char *filter) |
1021 | { | |
1022 | int i; | |
1023 | struct diff_queue_struct *q = &diff_queued_diff; | |
1024 | struct diff_queue_struct outq; | |
1025 | outq.queue = NULL; | |
1026 | outq.nr = outq.alloc = 0; | |
1027 | ||
1028 | if (!filter) | |
1029 | return; | |
1030 | ||
1031 | if (strchr(filter, 'A')) { | |
1032 | /* All-or-none */ | |
1033 | int found; | |
1034 | for (i = found = 0; !found && i < q->nr; i++) { | |
1035 | struct diff_filepair *p = q->queue[i]; | |
366175ef JH |
1036 | if (((p->status == 'M') && |
1037 | ((p->score && strchr(filter, 'B')) || | |
1038 | (!p->score && strchr(filter, 'M')))) || | |
1039 | ((p->status != 'M') && strchr(filter, p->status))) | |
f2ce9fde JH |
1040 | found++; |
1041 | } | |
1042 | if (found) | |
1043 | return; | |
1044 | ||
1045 | /* otherwise we will clear the whole queue | |
1046 | * by copying the empty outq at the end of this | |
1047 | * function, but first clear the current entries | |
1048 | * in the queue. | |
1049 | */ | |
1050 | for (i = 0; i < q->nr; i++) | |
1051 | diff_free_filepair(q->queue[i]); | |
1052 | } | |
1053 | else { | |
1054 | /* Only the matching ones */ | |
1055 | for (i = 0; i < q->nr; i++) { | |
1056 | struct diff_filepair *p = q->queue[i]; | |
366175ef JH |
1057 | if (((p->status == 'M') && |
1058 | ((p->score && strchr(filter, 'B')) || | |
1059 | (!p->score && strchr(filter, 'M')))) || | |
1060 | ((p->status != 'M') && strchr(filter, p->status))) | |
f2ce9fde JH |
1061 | diff_q(&outq, p); |
1062 | else | |
1063 | diff_free_filepair(p); | |
1064 | } | |
1065 | } | |
1066 | free(q->queue); | |
1067 | *q = outq; | |
1068 | } | |
1069 | ||
befe8639 JH |
1070 | void diffcore_std(const char **paths, |
1071 | int detect_rename, int rename_score, | |
f345b0a0 | 1072 | const char *pickaxe, int pickaxe_opts, |
af5323e0 | 1073 | int break_opt, |
f2ce9fde JH |
1074 | const char *orderfile, |
1075 | const char *filter) | |
befe8639 JH |
1076 | { |
1077 | if (paths && paths[0]) | |
1078 | diffcore_pathspec(paths); | |
49d9e85d | 1079 | if (break_opt != -1) |
f345b0a0 | 1080 | diffcore_break(break_opt); |
befe8639 JH |
1081 | if (detect_rename) |
1082 | diffcore_rename(detect_rename, rename_score); | |
49d9e85d | 1083 | if (break_opt != -1) |
eeaa4603 | 1084 | diffcore_merge_broken(); |
befe8639 JH |
1085 | if (pickaxe) |
1086 | diffcore_pickaxe(pickaxe, pickaxe_opts); | |
af5323e0 JH |
1087 | if (orderfile) |
1088 | diffcore_order(orderfile); | |
f2ce9fde JH |
1089 | diff_resolve_rename_copy(); |
1090 | diffcore_apply_filter(filter); | |
1091 | } | |
1092 | ||
1093 | ||
1094 | void diffcore_std_no_resolve(const char **paths, | |
1095 | const char *pickaxe, int pickaxe_opts, | |
1096 | const char *orderfile, | |
1097 | const char *filter) | |
1098 | { | |
1099 | if (paths && paths[0]) | |
1100 | diffcore_pathspec(paths); | |
1101 | if (pickaxe) | |
1102 | diffcore_pickaxe(pickaxe, pickaxe_opts); | |
1103 | if (orderfile) | |
1104 | diffcore_order(orderfile); | |
1105 | diffcore_apply_filter(filter); | |
befe8639 JH |
1106 | } |
1107 | ||
77eb2720 JH |
1108 | void diff_addremove(int addremove, unsigned mode, |
1109 | const unsigned char *sha1, | |
1110 | const char *base, const char *path) | |
be3cfa85 | 1111 | { |
77eb2720 | 1112 | char concatpath[PATH_MAX]; |
427dcb4b JH |
1113 | struct diff_filespec *one, *two; |
1114 | ||
1115 | /* This may look odd, but it is a preparation for | |
1116 | * feeding "there are unchanged files which should | |
1117 | * not produce diffs, but when you are doing copy | |
1118 | * detection you would need them, so here they are" | |
1119 | * entries to the diff-core. They will be prefixed | |
1120 | * with something like '=' or '*' (I haven't decided | |
1121 | * which but should not make any difference). | |
f7c1512a | 1122 | * Feeding the same new and old to diff_change() |
bceafe75 JH |
1123 | * also has the same effect. |
1124 | * Before the final output happens, they are pruned after | |
1125 | * merged into rename/copy pairs as appropriate. | |
427dcb4b | 1126 | */ |
7ca45252 | 1127 | if (reverse_diff) |
427dcb4b JH |
1128 | addremove = (addremove == '+' ? '-' : |
1129 | addremove == '-' ? '+' : addremove); | |
7ca45252 | 1130 | |
427dcb4b JH |
1131 | if (!path) path = ""; |
1132 | sprintf(concatpath, "%s%s", base, path); | |
1133 | one = alloc_filespec(concatpath); | |
1134 | two = alloc_filespec(concatpath); | |
be3cfa85 | 1135 | |
427dcb4b JH |
1136 | if (addremove != '+') |
1137 | fill_filespec(one, sha1, mode); | |
1138 | if (addremove != '-') | |
1139 | fill_filespec(two, sha1, mode); | |
5c97558c | 1140 | |
38c6f780 | 1141 | diff_queue(&diff_queued_diff, one, two); |
be3cfa85 JH |
1142 | } |
1143 | ||
b6d8f309 JH |
1144 | void diff_helper_input(unsigned old_mode, |
1145 | unsigned new_mode, | |
1146 | const unsigned char *old_sha1, | |
1147 | const unsigned char *new_sha1, | |
1148 | const char *old_path, | |
1149 | int status, | |
1150 | int score, | |
1151 | const char *new_path) | |
81e50eab JH |
1152 | { |
1153 | struct diff_filespec *one, *two; | |
b6d8f309 | 1154 | struct diff_filepair *dp; |
81e50eab | 1155 | |
81e50eab JH |
1156 | one = alloc_filespec(old_path); |
1157 | two = alloc_filespec(new_path); | |
1158 | if (old_mode) | |
1159 | fill_filespec(one, old_sha1, old_mode); | |
1160 | if (new_mode) | |
1161 | fill_filespec(two, new_sha1, new_mode); | |
b6d8f309 | 1162 | dp = diff_queue(&diff_queued_diff, one, two); |
903d475a | 1163 | dp->score = score * MAX_SCORE / 100; |
b6d8f309 | 1164 | dp->status = status; |
81e50eab JH |
1165 | } |
1166 | ||
77eb2720 JH |
1167 | void diff_change(unsigned old_mode, unsigned new_mode, |
1168 | const unsigned char *old_sha1, | |
1169 | const unsigned char *new_sha1, | |
81e50eab JH |
1170 | const char *base, const char *path) |
1171 | { | |
77eb2720 | 1172 | char concatpath[PATH_MAX]; |
427dcb4b | 1173 | struct diff_filespec *one, *two; |
77eb2720 | 1174 | |
7ca45252 JH |
1175 | if (reverse_diff) { |
1176 | unsigned tmp; | |
1177 | const unsigned char *tmp_c; | |
1178 | tmp = old_mode; old_mode = new_mode; new_mode = tmp; | |
1179 | tmp_c = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_c; | |
1180 | } | |
427dcb4b JH |
1181 | if (!path) path = ""; |
1182 | sprintf(concatpath, "%s%s", base, path); | |
1183 | one = alloc_filespec(concatpath); | |
1184 | two = alloc_filespec(concatpath); | |
1185 | fill_filespec(one, old_sha1, old_mode); | |
1186 | fill_filespec(two, new_sha1, new_mode); | |
1187 | ||
38c6f780 | 1188 | diff_queue(&diff_queued_diff, one, two); |
77eb2720 | 1189 | } |
be3cfa85 | 1190 | |
77eb2720 JH |
1191 | void diff_unmerge(const char *path) |
1192 | { | |
6b14d7fa JH |
1193 | struct diff_filespec *one, *two; |
1194 | one = alloc_filespec(path); | |
1195 | two = alloc_filespec(path); | |
1196 | diff_queue(&diff_queued_diff, one, two); | |
86436c28 | 1197 | } |