Add t7506 to test submodule related functions for git-status
[git/git.git] / diff-lib.c
CommitLineData
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
19static 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
35static 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
50static 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
151static 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
177static 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
233static 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
252int 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 }
59b0c24d
MM
267 if (nongit && argc != i + 2)
268 die("git diff [--no-index] takes two paths");
269
fcfa33ec
JS
270 if (argc != i + 2 || (!is_outside_repo(argv[i + 1], nongit, prefix) &&
271 !is_outside_repo(argv[i], nongit, prefix)))
272 return -1;
273
274 diff_setup(&revs->diffopt);
275 for (i = 1; i < argc - 2; )
276 if (!strcmp(argv[i], "--no-index"))
277 i++;
278 else {
279 int j = diff_opt_parse(&revs->diffopt,
280 argv + i, argc - i);
281 if (!j)
282 die("invalid diff option/value: %s", argv[i]);
283 i += j;
284 }
ae792aa5
JH
285
286 if (prefix) {
287 int len = strlen(prefix);
288
289 revs->diffopt.paths = xcalloc(2, sizeof(char*));
290 for (i = 0; i < 2; i++) {
3afaa72d
JH
291 const char *p = argv[argc - 2 + i];
292 /*
293 * stdin should be spelled as '-'; if you have
294 * path that is '-', spell it as ./-.
295 */
296 p = (strcmp(p, "-")
297 ? xstrdup(prefix_filename(prefix, len, p))
298 : p);
299 revs->diffopt.paths[i] = p;
ae792aa5
JH
300 }
301 }
302 else
303 revs->diffopt.paths = argv + argc - 2;
fcfa33ec 304 revs->diffopt.nr_paths = 2;
8f67f8ae 305 DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
fcfa33ec 306 revs->max_count = -2;
b78281f7
JH
307 if (diff_setup_done(&revs->diffopt) < 0)
308 die("diff_setup_done failed");
fcfa33ec
JS
309 return 0;
310}
311
d516c2d1
JS
312int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv)
313{
4bd5b7da 314 unsigned int options;
d516c2d1 315
4bd5b7da 316 if (handle_diff_files_args(revs, argc, argv, &options))
d516c2d1
JS
317 return -1;
318
8f67f8ae 319 if (DIFF_OPT_TST(&revs->diffopt, NO_INDEX)) {
d516c2d1
JS
320 if (revs->diffopt.nr_paths != 2)
321 return error("need two files/directories with --no-index");
34a5e1a2
JS
322 if (queue_diff(&revs->diffopt, revs->diffopt.paths[0],
323 revs->diffopt.paths[1]))
324 return -1;
d516c2d1
JS
325 diffcore_std(&revs->diffopt);
326 diff_flush(&revs->diffopt);
34a5e1a2
JS
327 /*
328 * The return code for --no-index imitates diff(1):
329 * 0 = no changes, 1 = changes, else error
330 */
331 return revs->diffopt.found_changes;
d516c2d1
JS
332 }
333
efdfd6c8
JH
334 if (read_cache() < 0) {
335 perror("read_cache");
336 return -1;
337 }
4bd5b7da 338 return run_diff_files(revs, options);
d516c2d1 339}
948dd346
JH
340/*
341 * See if work tree has an entity that can be staged. Return 0 if so,
342 * return 1 if not and return -1 if error.
343 */
344static int check_work_tree_entity(const struct cache_entry *ce, struct stat *st, char *symcache)
345{
346 if (lstat(ce->name, st) < 0) {
347 if (errno != ENOENT && errno != ENOTDIR)
348 return -1;
349 return 1;
350 }
351 if (has_symlink_leading_path(ce->name, symcache))
352 return 1;
353 if (S_ISDIR(st->st_mode)) {
354 unsigned char sub[20];
355 if (resolve_gitlink_ref(ce->name, "HEAD", sub))
356 return 1;
357 }
358 return 0;
359}
d516c2d1 360
4bd5b7da 361int run_diff_files(struct rev_info *revs, unsigned int option)
f0c6b2a2 362{
6973dcae
JH
363 int entries, i;
364 int diff_unmerged_stage = revs->max_count;
4bd5b7da 365 int silent_on_removed = option & DIFF_SILENT_ON_REMOVED;
fb63d7f8
JH
366 unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
367 ? CE_MATCH_RACY_IS_DIRTY : 0);
f58dbf23 368 char symcache[PATH_MAX];
f0c6b2a2 369
6973dcae
JH
370 if (diff_unmerged_stage < 0)
371 diff_unmerged_stage = 2;
b4e1e4a7 372 entries = active_nr;
f58dbf23 373 symcache[0] = '\0';
6973dcae 374 for (i = 0; i < entries; i++) {
be3cfa85 375 struct stat st;
6973dcae
JH
376 unsigned int oldmode, newmode;
377 struct cache_entry *ce = active_cache[i];
378 int changed;
8676eb43 379
8f67f8ae
PH
380 if (DIFF_OPT_TST(&revs->diffopt, QUIET) &&
381 DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
822cac01
JH
382 break;
383
6973dcae 384 if (!ce_path_match(ce, revs->prune_data))
8676eb43 385 continue;
be3cfa85 386
6973dcae 387 if (ce_stage(ce)) {
b4b15503 388 struct combine_diff_path *dpath;
6973dcae 389 int num_compare_stages = 0;
b4b15503 390 size_t path_len;
6973dcae 391
b4b15503
FF
392 path_len = ce_namelen(ce);
393
4fc970c4 394 dpath = xmalloc(combine_diff_path_size(5, path_len));
b4b15503
FF
395 dpath->path = (char *) &(dpath->parent[5]);
396
397 dpath->next = NULL;
398 dpath->len = path_len;
399 memcpy(dpath->path, ce->name, path_len);
400 dpath->path[path_len] = '\0';
a8e0d16d 401 hashclr(dpath->sha1);
b4b15503 402 memset(&(dpath->parent[0]), 0,
4fc970c4
JH
403 sizeof(struct combine_diff_parent)*5);
404
f58dbf23
JH
405 changed = check_work_tree_entity(ce, &st, symcache);
406 if (!changed)
407 dpath->mode = ce_mode_from_stat(ce, st.st_mode);
408 else {
409 if (changed < 0) {
4fc970c4
JH
410 perror(ce->name);
411 continue;
412 }
413 if (silent_on_removed)
414 continue;
415 }
6973dcae
JH
416
417 while (i < entries) {
418 struct cache_entry *nce = active_cache[i];
419 int stage;
420
421 if (strcmp(ce->name, nce->name))
422 break;
423
424 /* Stage #2 (ours) is the first parent,
425 * stage #3 (theirs) is the second.
426 */
427 stage = ce_stage(nce);
428 if (2 <= stage) {
7a51ed66 429 int mode = nce->ce_mode;
6973dcae 430 num_compare_stages++;
e702496e 431 hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
7a51ed66 432 dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode);
b4b15503 433 dpath->parent[stage-2].status =
6973dcae
JH
434 DIFF_STATUS_MODIFIED;
435 }
436
437 /* diff against the proper unmerged stage */
438 if (stage == diff_unmerged_stage)
439 ce = nce;
440 i++;
441 }
442 /*
443 * Compensate for loop update
f0c6b2a2 444 */
6973dcae 445 i--;
6b5ee137 446
6973dcae 447 if (revs->combine_merges && num_compare_stages == 2) {
b4b15503 448 show_combined_diff(dpath, 2,
6973dcae
JH
449 revs->dense_combined_merges,
450 revs);
b4b15503 451 free(dpath);
6973dcae 452 continue;
1b1480ff 453 }
b4b15503
FF
454 free(dpath);
455 dpath = NULL;
0e3994fa 456
6973dcae
JH
457 /*
458 * Show the diff for the 'ce' if we found the one
459 * from the desired stage.
460 */
e9c84099 461 diff_unmerge(&revs->diffopt, ce->name, 0, null_sha1);
6973dcae
JH
462 if (ce_stage(ce) != diff_unmerged_stage)
463 continue;
eeaa4603 464 }
6b14d7fa 465
d1f2d7e8
LT
466 if (ce_uptodate(ce))
467 continue;
f58dbf23
JH
468
469 changed = check_work_tree_entity(ce, &st, symcache);
470 if (changed) {
471 if (changed < 0) {
6973dcae 472 perror(ce->name);
15d061b4
JH
473 continue;
474 }
6973dcae
JH
475 if (silent_on_removed)
476 continue;
7a51ed66 477 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
6973dcae
JH
478 ce->sha1, ce->name, NULL);
479 continue;
f2ce9fde 480 }
fb63d7f8 481 changed = ce_match_stat(ce, &st, ce_option);
8f67f8ae 482 if (!changed && !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
6973dcae 483 continue;
7a51ed66
LT
484 oldmode = ce->ce_mode;
485 newmode = ce_mode_from_stat(ce, st.st_mode);
6973dcae
JH
486 diff_change(&revs->diffopt, oldmode, newmode,
487 ce->sha1, (changed ? null_sha1 : ce->sha1),
488 ce->name, NULL);
77eb2720 489
7ca45252 490 }
6973dcae
JH
491 diffcore_std(&revs->diffopt);
492 diff_flush(&revs->diffopt);
493 return 0;
77eb2720 494}
be3cfa85 495
e09ad6e1
JH
496/*
497 * diff-index
498 */
499
948dd346
JH
500struct oneway_unpack_data {
501 struct rev_info *revs;
502 char symcache[PATH_MAX];
503};
504
e09ad6e1
JH
505/* A file entry went away or appeared */
506static void diff_index_show_file(struct rev_info *revs,
507 const char *prefix,
508 struct cache_entry *ce,
c8c16f28 509 const unsigned char *sha1, unsigned int mode)
e09ad6e1 510{
7a51ed66 511 diff_addremove(&revs->diffopt, prefix[0], mode,
e09ad6e1
JH
512 sha1, ce->name, NULL);
513}
514
515static int get_stat_data(struct cache_entry *ce,
c8c16f28 516 const unsigned char **sha1p,
e09ad6e1 517 unsigned int *modep,
948dd346
JH
518 int cached, int match_missing,
519 struct oneway_unpack_data *cbdata)
e09ad6e1 520{
c8c16f28 521 const unsigned char *sha1 = ce->sha1;
e09ad6e1
JH
522 unsigned int mode = ce->ce_mode;
523
524 if (!cached) {
e09ad6e1
JH
525 int changed;
526 struct stat st;
948dd346
JH
527 changed = check_work_tree_entity(ce, &st, cbdata->symcache);
528 if (changed < 0)
529 return -1;
530 else if (changed) {
531 if (match_missing) {
e09ad6e1
JH
532 *sha1p = sha1;
533 *modep = mode;
534 return 0;
535 }
536 return -1;
537 }
538 changed = ce_match_stat(ce, &st, 0);
539 if (changed) {
185c975f 540 mode = ce_mode_from_stat(ce, st.st_mode);
c8c16f28 541 sha1 = null_sha1;
e09ad6e1
JH
542 }
543 }
544
545 *sha1p = sha1;
546 *modep = mode;
547 return 0;
548}
549
948dd346 550static void show_new_file(struct oneway_unpack_data *cbdata,
e09ad6e1
JH
551 struct cache_entry *new,
552 int cached, int match_missing)
553{
c8c16f28 554 const unsigned char *sha1;
e09ad6e1 555 unsigned int mode;
948dd346 556 struct rev_info *revs = cbdata->revs;
e09ad6e1 557
948dd346
JH
558 /*
559 * New file in the index: it might actually be different in
e09ad6e1
JH
560 * the working copy.
561 */
948dd346 562 if (get_stat_data(new, &sha1, &mode, cached, match_missing, cbdata) < 0)
e09ad6e1
JH
563 return;
564
565 diff_index_show_file(revs, "+", new, sha1, mode);
566}
567
948dd346 568static int show_modified(struct oneway_unpack_data *cbdata,
e09ad6e1
JH
569 struct cache_entry *old,
570 struct cache_entry *new,
571 int report_missing,
572 int cached, int match_missing)
573{
574 unsigned int mode, oldmode;
c8c16f28 575 const unsigned char *sha1;
948dd346 576 struct rev_info *revs = cbdata->revs;
e09ad6e1 577
948dd346 578 if (get_stat_data(new, &sha1, &mode, cached, match_missing, cbdata) < 0) {
e09ad6e1
JH
579 if (report_missing)
580 diff_index_show_file(revs, "-", old,
581 old->sha1, old->ce_mode);
582 return -1;
583 }
584
cb2b9f5e
PM
585 if (revs->combine_merges && !cached &&
586 (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
587 struct combine_diff_path *p;
588 int pathlen = ce_namelen(new);
589
590 p = xmalloc(combine_diff_path_size(2, pathlen));
591 p->path = (char *) &p->parent[2];
592 p->next = NULL;
593 p->len = pathlen;
594 memcpy(p->path, new->name, pathlen);
595 p->path[pathlen] = 0;
7a51ed66 596 p->mode = mode;
cb2b9f5e
PM
597 hashclr(p->sha1);
598 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
599 p->parent[0].status = DIFF_STATUS_MODIFIED;
7a51ed66 600 p->parent[0].mode = new->ce_mode;
cb2b9f5e
PM
601 hashcpy(p->parent[0].sha1, new->sha1);
602 p->parent[1].status = DIFF_STATUS_MODIFIED;
7a51ed66 603 p->parent[1].mode = old->ce_mode;
cb2b9f5e
PM
604 hashcpy(p->parent[1].sha1, old->sha1);
605 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
606 free(p);
607 return 0;
608 }
609
e09ad6e1 610 oldmode = old->ce_mode;
a89fccd2 611 if (mode == oldmode && !hashcmp(sha1, old->sha1) &&
8f67f8ae 612 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
e09ad6e1
JH
613 return 0;
614
e09ad6e1
JH
615 diff_change(&revs->diffopt, oldmode, mode,
616 old->sha1, sha1, old->name, NULL);
617 return 0;
618}
619
e09ad6e1
JH
620/*
621 * This turns all merge entries into "stage 3". That guarantees that
622 * when we read in the new tree (into "stage 1"), we won't lose sight
623 * of the fact that we had unmerged entries.
624 */
625static void mark_merge_entries(void)
626{
627 int i;
628 for (i = 0; i < active_nr; i++) {
629 struct cache_entry *ce = active_cache[i];
630 if (!ce_stage(ce))
631 continue;
7a51ed66 632 ce->ce_flags |= CE_STAGEMASK;
e09ad6e1
JH
633 }
634}
635
d1f2d7e8
LT
636/*
637 * This gets a mix of an existing index and a tree, one pathname entry
638 * at a time. The index entry may be a single stage-0 one, but it could
639 * also be multiple unmerged entries (in which case idx_pos/idx_nr will
640 * give you the position and number of entries in the index).
641 */
642static void do_oneway_diff(struct unpack_trees_options *o,
643 struct cache_entry *idx,
34110cd4 644 struct cache_entry *tree)
e09ad6e1 645{
948dd346
JH
646 struct oneway_unpack_data *cbdata = o->unpack_data;
647 struct rev_info *revs = cbdata->revs;
d1f2d7e8 648 int match_missing, cached;
5c21ac0e 649
a6080a0a 650 /*
5c21ac0e 651 * Backward compatibility wart - "diff-index -m" does
d1f2d7e8
LT
652 * not mean "do not ignore merges", but "match_missing".
653 *
654 * But with the revision flag parsing, that's found in
655 * "!revs->ignore_merges".
656 */
657 cached = o->index_only;
658 match_missing = !revs->ignore_merges;
659
660 if (cached && idx && ce_stage(idx)) {
661 if (tree)
662 diff_unmerge(&revs->diffopt, idx->name, idx->ce_mode, idx->sha1);
663 return;
664 }
665
666 /*
667 * Something added to the tree?
668 */
669 if (!tree) {
948dd346 670 show_new_file(cbdata, idx, cached, match_missing);
d1f2d7e8
LT
671 return;
672 }
673
674 /*
675 * Something removed from the tree?
5c21ac0e 676 */
d1f2d7e8
LT
677 if (!idx) {
678 diff_index_show_file(revs, "-", tree, tree->sha1, tree->ce_mode);
679 return;
680 }
681
682 /* Show difference between old and new */
948dd346 683 show_modified(cbdata, tree, idx, 1, cached, match_missing);
d1f2d7e8
LT
684}
685
20a16eb3
LT
686static inline void skip_same_name(struct cache_entry *ce, struct unpack_trees_options *o)
687{
688 int len = ce_namelen(ce);
689 const struct index_state *index = o->src_index;
690
691 while (o->pos < index->cache_nr) {
692 struct cache_entry *next = index->cache[o->pos];
693 if (len != ce_namelen(next))
694 break;
695 if (memcmp(ce->name, next->name, len))
696 break;
697 o->pos++;
698 }
699}
700
d1f2d7e8
LT
701/*
702 * The unpack_trees() interface is designed for merging, so
703 * the different source entries are designed primarily for
704 * the source trees, with the old index being really mainly
705 * used for being replaced by the result.
706 *
707 * For diffing, the index is more important, and we only have a
708 * single tree.
709 *
710 * We're supposed to return how many index entries we want to skip.
711 *
712 * This wrapper makes it all more readable, and takes care of all
713 * the fairly complex unpack_trees() semantic requirements, including
714 * the skipping, the path matching, the type conflict cases etc.
715 */
34110cd4 716static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o)
d1f2d7e8 717{
d1f2d7e8
LT
718 struct cache_entry *idx = src[0];
719 struct cache_entry *tree = src[1];
948dd346
JH
720 struct oneway_unpack_data *cbdata = o->unpack_data;
721 struct rev_info *revs = cbdata->revs;
d1f2d7e8 722
20a16eb3
LT
723 if (idx && ce_stage(idx))
724 skip_same_name(idx, o);
725
d1f2d7e8
LT
726 /*
727 * Unpack-trees generates a DF/conflict entry if
728 * there was a directory in the index and a tree
729 * in the tree. From a diff standpoint, that's a
730 * delete of the tree and a create of the file.
731 */
732 if (tree == o->df_conflict_entry)
733 tree = NULL;
734
735 if (ce_path_match(idx ? idx : tree, revs->prune_data))
34110cd4 736 do_oneway_diff(o, idx, tree);
d1f2d7e8 737
34110cd4 738 return 0;
d1f2d7e8
LT
739}
740
741int run_diff_index(struct rev_info *revs, int cached)
742{
743 struct object *ent;
744 struct tree *tree;
745 const char *tree_name;
746 struct unpack_trees_options opts;
747 struct tree_desc t;
948dd346 748 struct oneway_unpack_data unpack_cb;
e09ad6e1 749
e09ad6e1
JH
750 mark_merge_entries();
751
1f1e895f
LT
752 ent = revs->pending.objects[0].item;
753 tree_name = revs->pending.objects[0].name;
e09ad6e1
JH
754 tree = parse_tree_indirect(ent->sha1);
755 if (!tree)
756 return error("bad tree object %s", tree_name);
d1f2d7e8 757
948dd346
JH
758 unpack_cb.revs = revs;
759 unpack_cb.symcache[0] = '\0';
d1f2d7e8
LT
760 memset(&opts, 0, sizeof(opts));
761 opts.head_idx = 1;
762 opts.index_only = cached;
763 opts.merge = 1;
764 opts.fn = oneway_diff;
948dd346 765 opts.unpack_data = &unpack_cb;
34110cd4
LT
766 opts.src_index = &the_index;
767 opts.dst_index = NULL;
d1f2d7e8
LT
768
769 init_tree_desc(&t, tree->buffer, tree->size);
203a2fe1
DB
770 if (unpack_trees(1, &t, &opts))
771 exit(128);
d1f2d7e8 772
e09ad6e1
JH
773 diffcore_std(&revs->diffopt);
774 diff_flush(&revs->diffopt);
d1f2d7e8 775 return 0;
e09ad6e1 776}
1cfe7733
JH
777
778int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
779{
780 struct tree *tree;
781 struct rev_info revs;
782 int i;
783 struct cache_entry **dst;
784 struct cache_entry *last = NULL;
204ce979
JS
785 struct unpack_trees_options opts;
786 struct tree_desc t;
948dd346 787 struct oneway_unpack_data unpack_cb;
1cfe7733
JH
788
789 /*
790 * This is used by git-blame to run diff-cache internally;
791 * it potentially needs to repeatedly run this, so we will
792 * start by removing the higher order entries the last round
793 * left behind.
794 */
795 dst = active_cache;
796 for (i = 0; i < active_nr; i++) {
797 struct cache_entry *ce = active_cache[i];
798 if (ce_stage(ce)) {
799 if (last && !strcmp(ce->name, last->name))
800 continue;
801 cache_tree_invalidate_path(active_cache_tree,
802 ce->name);
803 last = ce;
7a51ed66 804 ce->ce_flags |= CE_REMOVE;
1cfe7733
JH
805 }
806 *dst++ = ce;
807 }
808 active_nr = dst - active_cache;
809
810 init_revisions(&revs, NULL);
811 revs.prune_data = opt->paths;
812 tree = parse_tree_indirect(tree_sha1);
813 if (!tree)
814 die("bad tree object %s", sha1_to_hex(tree_sha1));
204ce979 815
948dd346
JH
816 unpack_cb.revs = &revs;
817 unpack_cb.symcache[0] = '\0';
204ce979
JS
818 memset(&opts, 0, sizeof(opts));
819 opts.head_idx = 1;
820 opts.index_only = 1;
821 opts.merge = 1;
822 opts.fn = oneway_diff;
948dd346 823 opts.unpack_data = &unpack_cb;
34110cd4
LT
824 opts.src_index = &the_index;
825 opts.dst_index = &the_index;
204ce979
JS
826
827 init_tree_desc(&t, tree->buffer, tree->size);
203a2fe1
DB
828 if (unpack_trees(1, &t, &opts))
829 exit(128);
204ce979 830 return 0;
1cfe7733 831}