]>
Commit | Line | Data |
---|---|---|
be3cfa85 JH |
1 | /* |
2 | * Copyright (C) 2005 Junio C Hamano | |
3 | */ | |
86436c28 | 4 | #include "cache.h" |
6fb737be | 5 | #include "quote.h" |
6973dcae | 6 | #include "commit.h" |
86436c28 | 7 | #include "diff.h" |
427dcb4b | 8 | #include "diffcore.h" |
6973dcae | 9 | #include "revision.h" |
1cfe7733 | 10 | #include "cache-tree.h" |
d516c2d1 | 11 | #include "path-list.h" |
d1f2d7e8 | 12 | #include "unpack-trees.h" |
948dd346 | 13 | #include "refs.h" |
427dcb4b | 14 | |
b46f0b6d | 15 | /* |
6973dcae | 16 | * diff-files |
b46f0b6d | 17 | */ |
f0c6b2a2 | 18 | |
d516c2d1 JS |
19 | static int read_directory(const char *path, struct path_list *list) |
20 | { | |
21 | DIR *dir; | |
22 | struct dirent *e; | |
23 | ||
24 | if (!(dir = opendir(path))) | |
25 | return error("Could not open directory %s", path); | |
26 | ||
27 | while ((e = readdir(dir))) | |
28 | if (strcmp(".", e->d_name) && strcmp("..", e->d_name)) | |
4d3f4b80 | 29 | path_list_insert(e->d_name, list); |
d516c2d1 JS |
30 | |
31 | closedir(dir); | |
32 | return 0; | |
33 | } | |
34 | ||
0c725f1b JS |
35 | static int get_mode(const char *path, int *mode) |
36 | { | |
37 | struct stat st; | |
38 | ||
39 | if (!path || !strcmp(path, "/dev/null")) | |
40 | *mode = 0; | |
41 | else if (!strcmp(path, "-")) | |
7a51ed66 | 42 | *mode = create_ce_mode(0666); |
0c725f1b JS |
43 | else if (stat(path, &st)) |
44 | return error("Could not access '%s'", path); | |
45 | else | |
46 | *mode = st.st_mode; | |
47 | return 0; | |
48 | } | |
49 | ||
d516c2d1 JS |
50 | static int queue_diff(struct diff_options *o, |
51 | const char *name1, const char *name2) | |
52 | { | |
d516c2d1 JS |
53 | int mode1 = 0, mode2 = 0; |
54 | ||
0c725f1b JS |
55 | if (get_mode(name1, &mode1) || get_mode(name2, &mode2)) |
56 | return -1; | |
d516c2d1 JS |
57 | |
58 | if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2)) | |
59 | return error("file/directory conflict: %s, %s", name1, name2); | |
60 | ||
61 | if (S_ISDIR(mode1) || S_ISDIR(mode2)) { | |
62 | char buffer1[PATH_MAX], buffer2[PATH_MAX]; | |
63 | struct path_list p1 = {NULL, 0, 0, 1}, p2 = {NULL, 0, 0, 1}; | |
64 | int len1 = 0, len2 = 0, i1, i2, ret = 0; | |
65 | ||
66 | if (name1 && read_directory(name1, &p1)) | |
67 | return -1; | |
68 | if (name2 && read_directory(name2, &p2)) { | |
69 | path_list_clear(&p1, 0); | |
70 | return -1; | |
71 | } | |
72 | ||
73 | if (name1) { | |
74 | len1 = strlen(name1); | |
75 | if (len1 > 0 && name1[len1 - 1] == '/') | |
76 | len1--; | |
77 | memcpy(buffer1, name1, len1); | |
78 | buffer1[len1++] = '/'; | |
79 | } | |
80 | ||
81 | if (name2) { | |
82 | len2 = strlen(name2); | |
83 | if (len2 > 0 && name2[len2 - 1] == '/') | |
84 | len2--; | |
85 | memcpy(buffer2, name2, len2); | |
86 | buffer2[len2++] = '/'; | |
87 | } | |
88 | ||
89 | for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) { | |
90 | const char *n1, *n2; | |
91 | int comp; | |
92 | ||
93 | if (i1 == p1.nr) | |
94 | comp = 1; | |
95 | else if (i2 == p2.nr) | |
96 | comp = -1; | |
97 | else | |
98 | comp = strcmp(p1.items[i1].path, | |
99 | p2.items[i2].path); | |
100 | ||
101 | if (comp > 0) | |
102 | n1 = NULL; | |
103 | else { | |
104 | n1 = buffer1; | |
105 | strncpy(buffer1 + len1, p1.items[i1++].path, | |
106 | PATH_MAX - len1); | |
107 | } | |
108 | ||
109 | if (comp < 0) | |
110 | n2 = NULL; | |
111 | else { | |
112 | n2 = buffer2; | |
113 | strncpy(buffer2 + len2, p2.items[i2++].path, | |
114 | PATH_MAX - len2); | |
115 | } | |
116 | ||
117 | ret = queue_diff(o, n1, n2); | |
118 | } | |
119 | path_list_clear(&p1, 0); | |
120 | path_list_clear(&p2, 0); | |
121 | ||
122 | return ret; | |
123 | } else { | |
124 | struct diff_filespec *d1, *d2; | |
125 | ||
8f67f8ae | 126 | if (DIFF_OPT_TST(o, REVERSE_DIFF)) { |
d516c2d1 JS |
127 | unsigned tmp; |
128 | const char *tmp_c; | |
129 | tmp = mode1; mode1 = mode2; mode2 = tmp; | |
130 | tmp_c = name1; name1 = name2; name2 = tmp_c; | |
131 | } | |
132 | ||
133 | if (!name1) | |
134 | name1 = "/dev/null"; | |
135 | if (!name2) | |
136 | name2 = "/dev/null"; | |
137 | d1 = alloc_filespec(name1); | |
138 | d2 = alloc_filespec(name2); | |
139 | fill_filespec(d1, null_sha1, mode1); | |
140 | fill_filespec(d2, null_sha1, mode2); | |
141 | ||
142 | diff_queue(&diff_queued_diff, d1, d2); | |
143 | return 0; | |
144 | } | |
145 | } | |
146 | ||
1ad029b6 JH |
147 | /* |
148 | * Does the path name a blob in the working tree, or a directory | |
149 | * in the working tree? | |
150 | */ | |
d516c2d1 JS |
151 | static int is_in_index(const char *path) |
152 | { | |
1ad029b6 JH |
153 | int len, pos; |
154 | struct cache_entry *ce; | |
155 | ||
156 | len = strlen(path); | |
157 | while (path[len-1] == '/') | |
158 | len--; | |
159 | if (!len) | |
160 | return 1; /* "." */ | |
161 | pos = cache_name_pos(path, len); | |
162 | if (0 <= pos) | |
163 | return 1; | |
164 | pos = -1 - pos; | |
165 | while (pos < active_nr) { | |
166 | ce = active_cache[pos++]; | |
167 | if (ce_namelen(ce) <= len || | |
168 | strncmp(ce->name, path, len) || | |
169 | (ce->name[len] > '/')) | |
170 | break; /* path cannot be a prefix */ | |
171 | if (ce->name[len] == '/') | |
172 | return 1; | |
173 | } | |
174 | return 0; | |
d516c2d1 JS |
175 | } |
176 | ||
177 | static int handle_diff_files_args(struct rev_info *revs, | |
4bd5b7da JH |
178 | int argc, const char **argv, |
179 | unsigned int *options) | |
d516c2d1 | 180 | { |
4bd5b7da | 181 | *options = 0; |
d516c2d1 JS |
182 | |
183 | /* revs->max_count == -2 means --no-index */ | |
184 | while (1 < argc && argv[1][0] == '-') { | |
185 | if (!strcmp(argv[1], "--base")) | |
186 | revs->max_count = 1; | |
187 | else if (!strcmp(argv[1], "--ours")) | |
188 | revs->max_count = 2; | |
189 | else if (!strcmp(argv[1], "--theirs")) | |
190 | revs->max_count = 3; | |
191 | else if (!strcmp(argv[1], "-n") || | |
41bbf9d5 | 192 | !strcmp(argv[1], "--no-index")) { |
d516c2d1 | 193 | revs->max_count = -2; |
8f67f8ae PH |
194 | DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS); |
195 | DIFF_OPT_SET(&revs->diffopt, NO_INDEX); | |
41bbf9d5 | 196 | } |
d516c2d1 | 197 | else if (!strcmp(argv[1], "-q")) |
4bd5b7da | 198 | *options |= DIFF_SILENT_ON_REMOVED; |
d516c2d1 JS |
199 | else |
200 | return error("invalid option: %s", argv[1]); | |
201 | argv++; argc--; | |
202 | } | |
203 | ||
204 | if (revs->max_count == -1 && revs->diffopt.nr_paths == 2) { | |
205 | /* | |
206 | * If two files are specified, and at least one is untracked, | |
207 | * default to no-index. | |
208 | */ | |
209 | read_cache(); | |
210 | if (!is_in_index(revs->diffopt.paths[0]) || | |
6d2d9e86 | 211 | !is_in_index(revs->diffopt.paths[1])) { |
d516c2d1 | 212 | revs->max_count = -2; |
8f67f8ae | 213 | DIFF_OPT_SET(&revs->diffopt, NO_INDEX); |
6d2d9e86 | 214 | } |
d516c2d1 JS |
215 | } |
216 | ||
217 | /* | |
218 | * Make sure there are NO revision (i.e. pending object) parameter, | |
219 | * rev.max_count is reasonable (0 <= n <= 3), | |
220 | * there is no other revision filtering parameters. | |
221 | */ | |
222 | if (revs->pending.nr || revs->max_count > 3 || | |
223 | revs->min_age != -1 || revs->max_age != -1) | |
224 | return error("no revision allowed with diff-files"); | |
225 | ||
226 | if (revs->max_count == -1 && | |
227 | (revs->diffopt.output_format & DIFF_FORMAT_PATCH)) | |
228 | revs->combine_merges = revs->dense_combined_merges = 1; | |
229 | ||
230 | return 0; | |
231 | } | |
232 | ||
fcfa33ec JS |
233 | static int is_outside_repo(const char *path, int nongit, const char *prefix) |
234 | { | |
235 | int i; | |
ecf4831d | 236 | if (nongit || !strcmp(path, "-") || is_absolute_path(path)) |
fcfa33ec JS |
237 | return 1; |
238 | if (prefixcmp(path, "../")) | |
239 | return 0; | |
240 | if (!prefix) | |
241 | return 1; | |
242 | for (i = strlen(prefix); !prefixcmp(path, "../"); ) { | |
243 | while (i > 0 && prefix[i - 1] != '/') | |
244 | i--; | |
245 | if (--i < 0) | |
246 | return 1; | |
247 | path += 3; | |
248 | } | |
249 | return 0; | |
250 | } | |
251 | ||
252 | int setup_diff_no_index(struct rev_info *revs, | |
253 | int argc, const char ** argv, int nongit, const char *prefix) | |
254 | { | |
255 | int i; | |
256 | for (i = 1; i < argc; i++) | |
5332b2af | 257 | if (argv[i][0] != '-' || argv[i][1] == '\0') |
fcfa33ec JS |
258 | break; |
259 | else if (!strcmp(argv[i], "--")) { | |
260 | i++; | |
261 | break; | |
262 | } else if (i < argc - 3 && !strcmp(argv[i], "--no-index")) { | |
263 | i = argc - 3; | |
8f67f8ae | 264 | DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS); |
fcfa33ec JS |
265 | break; |
266 | } | |
267 | if (argc != i + 2 || (!is_outside_repo(argv[i + 1], nongit, prefix) && | |
268 | !is_outside_repo(argv[i], nongit, prefix))) | |
269 | return -1; | |
270 | ||
271 | diff_setup(&revs->diffopt); | |
272 | for (i = 1; i < argc - 2; ) | |
273 | if (!strcmp(argv[i], "--no-index")) | |
274 | i++; | |
275 | else { | |
276 | int j = diff_opt_parse(&revs->diffopt, | |
277 | argv + i, argc - i); | |
278 | if (!j) | |
279 | die("invalid diff option/value: %s", argv[i]); | |
280 | i += j; | |
281 | } | |
ae792aa5 JH |
282 | |
283 | if (prefix) { | |
284 | int len = strlen(prefix); | |
285 | ||
286 | revs->diffopt.paths = xcalloc(2, sizeof(char*)); | |
287 | for (i = 0; i < 2; i++) { | |
3afaa72d JH |
288 | const char *p = argv[argc - 2 + i]; |
289 | /* | |
290 | * stdin should be spelled as '-'; if you have | |
291 | * path that is '-', spell it as ./-. | |
292 | */ | |
293 | p = (strcmp(p, "-") | |
294 | ? xstrdup(prefix_filename(prefix, len, p)) | |
295 | : p); | |
296 | revs->diffopt.paths[i] = p; | |
ae792aa5 JH |
297 | } |
298 | } | |
299 | else | |
300 | revs->diffopt.paths = argv + argc - 2; | |
fcfa33ec | 301 | revs->diffopt.nr_paths = 2; |
8f67f8ae | 302 | DIFF_OPT_SET(&revs->diffopt, NO_INDEX); |
fcfa33ec | 303 | revs->max_count = -2; |
b78281f7 JH |
304 | if (diff_setup_done(&revs->diffopt) < 0) |
305 | die("diff_setup_done failed"); | |
fcfa33ec JS |
306 | return 0; |
307 | } | |
308 | ||
d516c2d1 JS |
309 | int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv) |
310 | { | |
4bd5b7da | 311 | unsigned int options; |
d516c2d1 | 312 | |
4bd5b7da | 313 | if (handle_diff_files_args(revs, argc, argv, &options)) |
d516c2d1 JS |
314 | return -1; |
315 | ||
8f67f8ae | 316 | if (DIFF_OPT_TST(&revs->diffopt, NO_INDEX)) { |
d516c2d1 JS |
317 | if (revs->diffopt.nr_paths != 2) |
318 | return error("need two files/directories with --no-index"); | |
34a5e1a2 JS |
319 | if (queue_diff(&revs->diffopt, revs->diffopt.paths[0], |
320 | revs->diffopt.paths[1])) | |
321 | return -1; | |
d516c2d1 JS |
322 | diffcore_std(&revs->diffopt); |
323 | diff_flush(&revs->diffopt); | |
34a5e1a2 JS |
324 | /* |
325 | * The return code for --no-index imitates diff(1): | |
326 | * 0 = no changes, 1 = changes, else error | |
327 | */ | |
328 | return revs->diffopt.found_changes; | |
d516c2d1 JS |
329 | } |
330 | ||
efdfd6c8 JH |
331 | if (read_cache() < 0) { |
332 | perror("read_cache"); | |
333 | return -1; | |
334 | } | |
4bd5b7da | 335 | return run_diff_files(revs, options); |
d516c2d1 | 336 | } |
948dd346 JH |
337 | /* |
338 | * See if work tree has an entity that can be staged. Return 0 if so, | |
339 | * return 1 if not and return -1 if error. | |
340 | */ | |
341 | static int check_work_tree_entity(const struct cache_entry *ce, struct stat *st, char *symcache) | |
342 | { | |
343 | if (lstat(ce->name, st) < 0) { | |
344 | if (errno != ENOENT && errno != ENOTDIR) | |
345 | return -1; | |
346 | return 1; | |
347 | } | |
348 | if (has_symlink_leading_path(ce->name, symcache)) | |
349 | return 1; | |
350 | if (S_ISDIR(st->st_mode)) { | |
351 | unsigned char sub[20]; | |
352 | if (resolve_gitlink_ref(ce->name, "HEAD", sub)) | |
353 | return 1; | |
354 | } | |
355 | return 0; | |
356 | } | |
d516c2d1 | 357 | |
4bd5b7da | 358 | int run_diff_files(struct rev_info *revs, unsigned int option) |
f0c6b2a2 | 359 | { |
6973dcae JH |
360 | int entries, i; |
361 | int diff_unmerged_stage = revs->max_count; | |
4bd5b7da | 362 | int silent_on_removed = option & DIFF_SILENT_ON_REMOVED; |
fb63d7f8 JH |
363 | unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED) |
364 | ? CE_MATCH_RACY_IS_DIRTY : 0); | |
f0c6b2a2 | 365 | |
6973dcae JH |
366 | if (diff_unmerged_stage < 0) |
367 | diff_unmerged_stage = 2; | |
b4e1e4a7 | 368 | entries = active_nr; |
6973dcae | 369 | for (i = 0; i < entries; i++) { |
be3cfa85 | 370 | struct stat st; |
6973dcae JH |
371 | unsigned int oldmode, newmode; |
372 | struct cache_entry *ce = active_cache[i]; | |
373 | int changed; | |
8676eb43 | 374 | |
8f67f8ae PH |
375 | if (DIFF_OPT_TST(&revs->diffopt, QUIET) && |
376 | DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES)) | |
822cac01 JH |
377 | break; |
378 | ||
6973dcae | 379 | if (!ce_path_match(ce, revs->prune_data)) |
8676eb43 | 380 | continue; |
be3cfa85 | 381 | |
6973dcae | 382 | if (ce_stage(ce)) { |
b4b15503 | 383 | struct combine_diff_path *dpath; |
6973dcae | 384 | int num_compare_stages = 0; |
b4b15503 | 385 | size_t path_len; |
6973dcae | 386 | |
b4b15503 FF |
387 | path_len = ce_namelen(ce); |
388 | ||
4fc970c4 | 389 | dpath = xmalloc(combine_diff_path_size(5, path_len)); |
b4b15503 FF |
390 | dpath->path = (char *) &(dpath->parent[5]); |
391 | ||
392 | dpath->next = NULL; | |
393 | dpath->len = path_len; | |
394 | memcpy(dpath->path, ce->name, path_len); | |
395 | dpath->path[path_len] = '\0'; | |
a8e0d16d | 396 | hashclr(dpath->sha1); |
b4b15503 | 397 | memset(&(dpath->parent[0]), 0, |
4fc970c4 JH |
398 | sizeof(struct combine_diff_parent)*5); |
399 | ||
400 | if (lstat(ce->name, &st) < 0) { | |
401 | if (errno != ENOENT && errno != ENOTDIR) { | |
402 | perror(ce->name); | |
403 | continue; | |
404 | } | |
405 | if (silent_on_removed) | |
406 | continue; | |
407 | } | |
408 | else | |
7a51ed66 | 409 | dpath->mode = ce_mode_from_stat(ce, st.st_mode); |
6973dcae JH |
410 | |
411 | while (i < entries) { | |
412 | struct cache_entry *nce = active_cache[i]; | |
413 | int stage; | |
414 | ||
415 | if (strcmp(ce->name, nce->name)) | |
416 | break; | |
417 | ||
418 | /* Stage #2 (ours) is the first parent, | |
419 | * stage #3 (theirs) is the second. | |
420 | */ | |
421 | stage = ce_stage(nce); | |
422 | if (2 <= stage) { | |
7a51ed66 | 423 | int mode = nce->ce_mode; |
6973dcae | 424 | num_compare_stages++; |
e702496e | 425 | hashcpy(dpath->parent[stage-2].sha1, nce->sha1); |
7a51ed66 | 426 | dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode); |
b4b15503 | 427 | dpath->parent[stage-2].status = |
6973dcae JH |
428 | DIFF_STATUS_MODIFIED; |
429 | } | |
430 | ||
431 | /* diff against the proper unmerged stage */ | |
432 | if (stage == diff_unmerged_stage) | |
433 | ce = nce; | |
434 | i++; | |
435 | } | |
436 | /* | |
437 | * Compensate for loop update | |
f0c6b2a2 | 438 | */ |
6973dcae | 439 | i--; |
6b5ee137 | 440 | |
6973dcae | 441 | if (revs->combine_merges && num_compare_stages == 2) { |
b4b15503 | 442 | show_combined_diff(dpath, 2, |
6973dcae JH |
443 | revs->dense_combined_merges, |
444 | revs); | |
b4b15503 | 445 | free(dpath); |
6973dcae | 446 | continue; |
1b1480ff | 447 | } |
b4b15503 FF |
448 | free(dpath); |
449 | dpath = NULL; | |
0e3994fa | 450 | |
6973dcae JH |
451 | /* |
452 | * Show the diff for the 'ce' if we found the one | |
453 | * from the desired stage. | |
454 | */ | |
e9c84099 | 455 | diff_unmerge(&revs->diffopt, ce->name, 0, null_sha1); |
6973dcae JH |
456 | if (ce_stage(ce) != diff_unmerged_stage) |
457 | continue; | |
eeaa4603 | 458 | } |
6b14d7fa | 459 | |
d1f2d7e8 LT |
460 | if (ce_uptodate(ce)) |
461 | continue; | |
6973dcae JH |
462 | if (lstat(ce->name, &st) < 0) { |
463 | if (errno != ENOENT && errno != ENOTDIR) { | |
464 | perror(ce->name); | |
15d061b4 JH |
465 | continue; |
466 | } | |
6973dcae JH |
467 | if (silent_on_removed) |
468 | continue; | |
7a51ed66 | 469 | diff_addremove(&revs->diffopt, '-', ce->ce_mode, |
6973dcae JH |
470 | ce->sha1, ce->name, NULL); |
471 | continue; | |
f2ce9fde | 472 | } |
fb63d7f8 | 473 | changed = ce_match_stat(ce, &st, ce_option); |
8f67f8ae | 474 | if (!changed && !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER)) |
6973dcae | 475 | continue; |
7a51ed66 LT |
476 | oldmode = ce->ce_mode; |
477 | newmode = ce_mode_from_stat(ce, st.st_mode); | |
6973dcae JH |
478 | diff_change(&revs->diffopt, oldmode, newmode, |
479 | ce->sha1, (changed ? null_sha1 : ce->sha1), | |
480 | ce->name, NULL); | |
77eb2720 | 481 | |
7ca45252 | 482 | } |
6973dcae JH |
483 | diffcore_std(&revs->diffopt); |
484 | diff_flush(&revs->diffopt); | |
485 | return 0; | |
77eb2720 | 486 | } |
be3cfa85 | 487 | |
e09ad6e1 JH |
488 | /* |
489 | * diff-index | |
490 | */ | |
491 | ||
948dd346 JH |
492 | struct oneway_unpack_data { |
493 | struct rev_info *revs; | |
494 | char symcache[PATH_MAX]; | |
495 | }; | |
496 | ||
e09ad6e1 JH |
497 | /* A file entry went away or appeared */ |
498 | static void diff_index_show_file(struct rev_info *revs, | |
499 | const char *prefix, | |
500 | struct cache_entry *ce, | |
c8c16f28 | 501 | const unsigned char *sha1, unsigned int mode) |
e09ad6e1 | 502 | { |
7a51ed66 | 503 | diff_addremove(&revs->diffopt, prefix[0], mode, |
e09ad6e1 JH |
504 | sha1, ce->name, NULL); |
505 | } | |
506 | ||
507 | static int get_stat_data(struct cache_entry *ce, | |
c8c16f28 | 508 | const unsigned char **sha1p, |
e09ad6e1 | 509 | unsigned int *modep, |
948dd346 JH |
510 | int cached, int match_missing, |
511 | struct oneway_unpack_data *cbdata) | |
e09ad6e1 | 512 | { |
c8c16f28 | 513 | const unsigned char *sha1 = ce->sha1; |
e09ad6e1 JH |
514 | unsigned int mode = ce->ce_mode; |
515 | ||
516 | if (!cached) { | |
e09ad6e1 JH |
517 | int changed; |
518 | struct stat st; | |
948dd346 JH |
519 | changed = check_work_tree_entity(ce, &st, cbdata->symcache); |
520 | if (changed < 0) | |
521 | return -1; | |
522 | else if (changed) { | |
523 | if (match_missing) { | |
e09ad6e1 JH |
524 | *sha1p = sha1; |
525 | *modep = mode; | |
526 | return 0; | |
527 | } | |
528 | return -1; | |
529 | } | |
530 | changed = ce_match_stat(ce, &st, 0); | |
531 | if (changed) { | |
185c975f | 532 | mode = ce_mode_from_stat(ce, st.st_mode); |
c8c16f28 | 533 | sha1 = null_sha1; |
e09ad6e1 JH |
534 | } |
535 | } | |
536 | ||
537 | *sha1p = sha1; | |
538 | *modep = mode; | |
539 | return 0; | |
540 | } | |
541 | ||
948dd346 | 542 | static void show_new_file(struct oneway_unpack_data *cbdata, |
e09ad6e1 JH |
543 | struct cache_entry *new, |
544 | int cached, int match_missing) | |
545 | { | |
c8c16f28 | 546 | const unsigned char *sha1; |
e09ad6e1 | 547 | unsigned int mode; |
948dd346 | 548 | struct rev_info *revs = cbdata->revs; |
e09ad6e1 | 549 | |
948dd346 JH |
550 | /* |
551 | * New file in the index: it might actually be different in | |
e09ad6e1 JH |
552 | * the working copy. |
553 | */ | |
948dd346 | 554 | if (get_stat_data(new, &sha1, &mode, cached, match_missing, cbdata) < 0) |
e09ad6e1 JH |
555 | return; |
556 | ||
557 | diff_index_show_file(revs, "+", new, sha1, mode); | |
558 | } | |
559 | ||
948dd346 | 560 | static int show_modified(struct oneway_unpack_data *cbdata, |
e09ad6e1 JH |
561 | struct cache_entry *old, |
562 | struct cache_entry *new, | |
563 | int report_missing, | |
564 | int cached, int match_missing) | |
565 | { | |
566 | unsigned int mode, oldmode; | |
c8c16f28 | 567 | const unsigned char *sha1; |
948dd346 | 568 | struct rev_info *revs = cbdata->revs; |
e09ad6e1 | 569 | |
948dd346 | 570 | if (get_stat_data(new, &sha1, &mode, cached, match_missing, cbdata) < 0) { |
e09ad6e1 JH |
571 | if (report_missing) |
572 | diff_index_show_file(revs, "-", old, | |
573 | old->sha1, old->ce_mode); | |
574 | return -1; | |
575 | } | |
576 | ||
cb2b9f5e PM |
577 | if (revs->combine_merges && !cached && |
578 | (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) { | |
579 | struct combine_diff_path *p; | |
580 | int pathlen = ce_namelen(new); | |
581 | ||
582 | p = xmalloc(combine_diff_path_size(2, pathlen)); | |
583 | p->path = (char *) &p->parent[2]; | |
584 | p->next = NULL; | |
585 | p->len = pathlen; | |
586 | memcpy(p->path, new->name, pathlen); | |
587 | p->path[pathlen] = 0; | |
7a51ed66 | 588 | p->mode = mode; |
cb2b9f5e PM |
589 | hashclr(p->sha1); |
590 | memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent)); | |
591 | p->parent[0].status = DIFF_STATUS_MODIFIED; | |
7a51ed66 | 592 | p->parent[0].mode = new->ce_mode; |
cb2b9f5e PM |
593 | hashcpy(p->parent[0].sha1, new->sha1); |
594 | p->parent[1].status = DIFF_STATUS_MODIFIED; | |
7a51ed66 | 595 | p->parent[1].mode = old->ce_mode; |
cb2b9f5e PM |
596 | hashcpy(p->parent[1].sha1, old->sha1); |
597 | show_combined_diff(p, 2, revs->dense_combined_merges, revs); | |
598 | free(p); | |
599 | return 0; | |
600 | } | |
601 | ||
e09ad6e1 | 602 | oldmode = old->ce_mode; |
a89fccd2 | 603 | if (mode == oldmode && !hashcmp(sha1, old->sha1) && |
8f67f8ae | 604 | !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER)) |
e09ad6e1 JH |
605 | return 0; |
606 | ||
e09ad6e1 JH |
607 | diff_change(&revs->diffopt, oldmode, mode, |
608 | old->sha1, sha1, old->name, NULL); | |
609 | return 0; | |
610 | } | |
611 | ||
e09ad6e1 JH |
612 | /* |
613 | * This turns all merge entries into "stage 3". That guarantees that | |
614 | * when we read in the new tree (into "stage 1"), we won't lose sight | |
615 | * of the fact that we had unmerged entries. | |
616 | */ | |
617 | static void mark_merge_entries(void) | |
618 | { | |
619 | int i; | |
620 | for (i = 0; i < active_nr; i++) { | |
621 | struct cache_entry *ce = active_cache[i]; | |
622 | if (!ce_stage(ce)) | |
623 | continue; | |
7a51ed66 | 624 | ce->ce_flags |= CE_STAGEMASK; |
e09ad6e1 JH |
625 | } |
626 | } | |
627 | ||
d1f2d7e8 LT |
628 | /* |
629 | * This gets a mix of an existing index and a tree, one pathname entry | |
630 | * at a time. The index entry may be a single stage-0 one, but it could | |
631 | * also be multiple unmerged entries (in which case idx_pos/idx_nr will | |
632 | * give you the position and number of entries in the index). | |
633 | */ | |
634 | static void do_oneway_diff(struct unpack_trees_options *o, | |
635 | struct cache_entry *idx, | |
34110cd4 | 636 | struct cache_entry *tree) |
e09ad6e1 | 637 | { |
948dd346 JH |
638 | struct oneway_unpack_data *cbdata = o->unpack_data; |
639 | struct rev_info *revs = cbdata->revs; | |
d1f2d7e8 | 640 | int match_missing, cached; |
5c21ac0e | 641 | |
a6080a0a | 642 | /* |
5c21ac0e | 643 | * Backward compatibility wart - "diff-index -m" does |
d1f2d7e8 LT |
644 | * not mean "do not ignore merges", but "match_missing". |
645 | * | |
646 | * But with the revision flag parsing, that's found in | |
647 | * "!revs->ignore_merges". | |
648 | */ | |
649 | cached = o->index_only; | |
650 | match_missing = !revs->ignore_merges; | |
651 | ||
652 | if (cached && idx && ce_stage(idx)) { | |
653 | if (tree) | |
654 | diff_unmerge(&revs->diffopt, idx->name, idx->ce_mode, idx->sha1); | |
655 | return; | |
656 | } | |
657 | ||
658 | /* | |
659 | * Something added to the tree? | |
660 | */ | |
661 | if (!tree) { | |
948dd346 | 662 | show_new_file(cbdata, idx, cached, match_missing); |
d1f2d7e8 LT |
663 | return; |
664 | } | |
665 | ||
666 | /* | |
667 | * Something removed from the tree? | |
5c21ac0e | 668 | */ |
d1f2d7e8 LT |
669 | if (!idx) { |
670 | diff_index_show_file(revs, "-", tree, tree->sha1, tree->ce_mode); | |
671 | return; | |
672 | } | |
673 | ||
674 | /* Show difference between old and new */ | |
948dd346 | 675 | show_modified(cbdata, tree, idx, 1, cached, match_missing); |
d1f2d7e8 LT |
676 | } |
677 | ||
20a16eb3 LT |
678 | static inline void skip_same_name(struct cache_entry *ce, struct unpack_trees_options *o) |
679 | { | |
680 | int len = ce_namelen(ce); | |
681 | const struct index_state *index = o->src_index; | |
682 | ||
683 | while (o->pos < index->cache_nr) { | |
684 | struct cache_entry *next = index->cache[o->pos]; | |
685 | if (len != ce_namelen(next)) | |
686 | break; | |
687 | if (memcmp(ce->name, next->name, len)) | |
688 | break; | |
689 | o->pos++; | |
690 | } | |
691 | } | |
692 | ||
d1f2d7e8 LT |
693 | /* |
694 | * The unpack_trees() interface is designed for merging, so | |
695 | * the different source entries are designed primarily for | |
696 | * the source trees, with the old index being really mainly | |
697 | * used for being replaced by the result. | |
698 | * | |
699 | * For diffing, the index is more important, and we only have a | |
700 | * single tree. | |
701 | * | |
702 | * We're supposed to return how many index entries we want to skip. | |
703 | * | |
704 | * This wrapper makes it all more readable, and takes care of all | |
705 | * the fairly complex unpack_trees() semantic requirements, including | |
706 | * the skipping, the path matching, the type conflict cases etc. | |
707 | */ | |
34110cd4 | 708 | static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o) |
d1f2d7e8 | 709 | { |
d1f2d7e8 LT |
710 | struct cache_entry *idx = src[0]; |
711 | struct cache_entry *tree = src[1]; | |
948dd346 JH |
712 | struct oneway_unpack_data *cbdata = o->unpack_data; |
713 | struct rev_info *revs = cbdata->revs; | |
d1f2d7e8 | 714 | |
20a16eb3 LT |
715 | if (idx && ce_stage(idx)) |
716 | skip_same_name(idx, o); | |
717 | ||
d1f2d7e8 LT |
718 | /* |
719 | * Unpack-trees generates a DF/conflict entry if | |
720 | * there was a directory in the index and a tree | |
721 | * in the tree. From a diff standpoint, that's a | |
722 | * delete of the tree and a create of the file. | |
723 | */ | |
724 | if (tree == o->df_conflict_entry) | |
725 | tree = NULL; | |
726 | ||
727 | if (ce_path_match(idx ? idx : tree, revs->prune_data)) | |
34110cd4 | 728 | do_oneway_diff(o, idx, tree); |
d1f2d7e8 | 729 | |
34110cd4 | 730 | return 0; |
d1f2d7e8 LT |
731 | } |
732 | ||
733 | int run_diff_index(struct rev_info *revs, int cached) | |
734 | { | |
735 | struct object *ent; | |
736 | struct tree *tree; | |
737 | const char *tree_name; | |
738 | struct unpack_trees_options opts; | |
739 | struct tree_desc t; | |
948dd346 | 740 | struct oneway_unpack_data unpack_cb; |
e09ad6e1 | 741 | |
e09ad6e1 JH |
742 | mark_merge_entries(); |
743 | ||
1f1e895f LT |
744 | ent = revs->pending.objects[0].item; |
745 | tree_name = revs->pending.objects[0].name; | |
e09ad6e1 JH |
746 | tree = parse_tree_indirect(ent->sha1); |
747 | if (!tree) | |
748 | return error("bad tree object %s", tree_name); | |
d1f2d7e8 | 749 | |
948dd346 JH |
750 | unpack_cb.revs = revs; |
751 | unpack_cb.symcache[0] = '\0'; | |
d1f2d7e8 LT |
752 | memset(&opts, 0, sizeof(opts)); |
753 | opts.head_idx = 1; | |
754 | opts.index_only = cached; | |
755 | opts.merge = 1; | |
756 | opts.fn = oneway_diff; | |
948dd346 | 757 | opts.unpack_data = &unpack_cb; |
34110cd4 LT |
758 | opts.src_index = &the_index; |
759 | opts.dst_index = NULL; | |
d1f2d7e8 LT |
760 | |
761 | init_tree_desc(&t, tree->buffer, tree->size); | |
203a2fe1 DB |
762 | if (unpack_trees(1, &t, &opts)) |
763 | exit(128); | |
d1f2d7e8 | 764 | |
e09ad6e1 JH |
765 | diffcore_std(&revs->diffopt); |
766 | diff_flush(&revs->diffopt); | |
d1f2d7e8 | 767 | return 0; |
e09ad6e1 | 768 | } |
1cfe7733 JH |
769 | |
770 | int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt) | |
771 | { | |
772 | struct tree *tree; | |
773 | struct rev_info revs; | |
774 | int i; | |
775 | struct cache_entry **dst; | |
776 | struct cache_entry *last = NULL; | |
204ce979 JS |
777 | struct unpack_trees_options opts; |
778 | struct tree_desc t; | |
948dd346 | 779 | struct oneway_unpack_data unpack_cb; |
1cfe7733 JH |
780 | |
781 | /* | |
782 | * This is used by git-blame to run diff-cache internally; | |
783 | * it potentially needs to repeatedly run this, so we will | |
784 | * start by removing the higher order entries the last round | |
785 | * left behind. | |
786 | */ | |
787 | dst = active_cache; | |
788 | for (i = 0; i < active_nr; i++) { | |
789 | struct cache_entry *ce = active_cache[i]; | |
790 | if (ce_stage(ce)) { | |
791 | if (last && !strcmp(ce->name, last->name)) | |
792 | continue; | |
793 | cache_tree_invalidate_path(active_cache_tree, | |
794 | ce->name); | |
795 | last = ce; | |
7a51ed66 | 796 | ce->ce_flags |= CE_REMOVE; |
1cfe7733 JH |
797 | } |
798 | *dst++ = ce; | |
799 | } | |
800 | active_nr = dst - active_cache; | |
801 | ||
802 | init_revisions(&revs, NULL); | |
803 | revs.prune_data = opt->paths; | |
804 | tree = parse_tree_indirect(tree_sha1); | |
805 | if (!tree) | |
806 | die("bad tree object %s", sha1_to_hex(tree_sha1)); | |
204ce979 | 807 | |
948dd346 JH |
808 | unpack_cb.revs = &revs; |
809 | unpack_cb.symcache[0] = '\0'; | |
204ce979 JS |
810 | memset(&opts, 0, sizeof(opts)); |
811 | opts.head_idx = 1; | |
812 | opts.index_only = 1; | |
813 | opts.merge = 1; | |
814 | opts.fn = oneway_diff; | |
948dd346 | 815 | opts.unpack_data = &unpack_cb; |
34110cd4 LT |
816 | opts.src_index = &the_index; |
817 | opts.dst_index = &the_index; | |
204ce979 JS |
818 | |
819 | init_tree_desc(&t, tree->buffer, tree->size); | |
203a2fe1 DB |
820 | if (unpack_trees(1, &t, &opts)) |
821 | exit(128); | |
204ce979 | 822 | return 0; |
1cfe7733 | 823 | } |