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