t4013: add tests for log -p -m --first-parent
[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"
d1f2d7e8 11#include "unpack-trees.h"
948dd346 12#include "refs.h"
ee6fc514 13#include "submodule.h"
427dcb4b 14
b46f0b6d 15/*
6973dcae 16 * diff-files
b46f0b6d 17 */
f0c6b2a2 18
948dd346 19/*
1392a377
JH
20 * Has the work tree entity been removed?
21 *
22 * Return 1 if it was removed from the work tree, 0 if an entity to be
23 * compared with the cache entry ce still exists (the latter includes
24 * the case where a directory that is not a submodule repository
25 * exists for ce that is a submodule -- it is a submodule that is not
26 * checked out). Return negative for an error.
948dd346 27 */
c40641b7 28static int check_removed(const struct cache_entry *ce, struct stat *st)
948dd346
JH
29{
30 if (lstat(ce->name, st) < 0) {
31 if (errno != ENOENT && errno != ENOTDIR)
32 return -1;
33 return 1;
34 }
57199892 35 if (has_symlink_leading_path(ce->name, ce_namelen(ce)))
948dd346
JH
36 return 1;
37 if (S_ISDIR(st->st_mode)) {
38 unsigned char sub[20];
1392a377
JH
39
40 /*
41 * If ce is already a gitlink, we can have a plain
42 * directory (i.e. the submodule is not checked out),
43 * or a checked out submodule. Either case this is not
44 * a case where something was removed from the work tree,
45 * so we will return 0.
46 *
47 * Otherwise, if the directory is not a submodule
48 * repository, that means ce which was a blob turned into
49 * a directory --- the blob was removed!
50 */
51 if (!S_ISGITLINK(ce->ce_mode) &&
52 resolve_gitlink_ref(ce->name, "HEAD", sub))
948dd346
JH
53 return 1;
54 }
55 return 0;
56}
d516c2d1 57
4bd5b7da 58int run_diff_files(struct rev_info *revs, unsigned int option)
f0c6b2a2 59{
6973dcae
JH
60 int entries, i;
61 int diff_unmerged_stage = revs->max_count;
4bd5b7da 62 int silent_on_removed = option & DIFF_SILENT_ON_REMOVED;
fb63d7f8
JH
63 unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
64 ? CE_MATCH_RACY_IS_DIRTY : 0);
f0c6b2a2 65
a5a818ee
JH
66 diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
67
6973dcae
JH
68 if (diff_unmerged_stage < 0)
69 diff_unmerged_stage = 2;
b4e1e4a7 70 entries = active_nr;
6973dcae 71 for (i = 0; i < entries; i++) {
be3cfa85 72 struct stat st;
6973dcae
JH
73 unsigned int oldmode, newmode;
74 struct cache_entry *ce = active_cache[i];
75 int changed;
e3d42c47 76 unsigned dirty_submodule = 0;
8676eb43 77
90b19941 78 if (DIFF_OPT_TST(&revs->diffopt, QUICK) &&
8f67f8ae 79 DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
822cac01
JH
80 break;
81
6973dcae 82 if (!ce_path_match(ce, revs->prune_data))
8676eb43 83 continue;
be3cfa85 84
6973dcae 85 if (ce_stage(ce)) {
b4b15503 86 struct combine_diff_path *dpath;
6973dcae 87 int num_compare_stages = 0;
b4b15503 88 size_t path_len;
6973dcae 89
b4b15503
FF
90 path_len = ce_namelen(ce);
91
4fc970c4 92 dpath = xmalloc(combine_diff_path_size(5, path_len));
b4b15503
FF
93 dpath->path = (char *) &(dpath->parent[5]);
94
95 dpath->next = NULL;
96 dpath->len = path_len;
97 memcpy(dpath->path, ce->name, path_len);
98 dpath->path[path_len] = '\0';
a8e0d16d 99 hashclr(dpath->sha1);
b4b15503 100 memset(&(dpath->parent[0]), 0,
4fc970c4
JH
101 sizeof(struct combine_diff_parent)*5);
102
c40641b7 103 changed = check_removed(ce, &st);
f58dbf23
JH
104 if (!changed)
105 dpath->mode = ce_mode_from_stat(ce, st.st_mode);
106 else {
107 if (changed < 0) {
4fc970c4
JH
108 perror(ce->name);
109 continue;
110 }
111 if (silent_on_removed)
112 continue;
113 }
6973dcae
JH
114
115 while (i < entries) {
116 struct cache_entry *nce = active_cache[i];
117 int stage;
118
119 if (strcmp(ce->name, nce->name))
120 break;
121
122 /* Stage #2 (ours) is the first parent,
123 * stage #3 (theirs) is the second.
124 */
125 stage = ce_stage(nce);
126 if (2 <= stage) {
7a51ed66 127 int mode = nce->ce_mode;
6973dcae 128 num_compare_stages++;
e702496e 129 hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
7a51ed66 130 dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode);
b4b15503 131 dpath->parent[stage-2].status =
6973dcae
JH
132 DIFF_STATUS_MODIFIED;
133 }
134
135 /* diff against the proper unmerged stage */
136 if (stage == diff_unmerged_stage)
137 ce = nce;
138 i++;
139 }
140 /*
141 * Compensate for loop update
f0c6b2a2 142 */
6973dcae 143 i--;
6b5ee137 144
6973dcae 145 if (revs->combine_merges && num_compare_stages == 2) {
b4b15503 146 show_combined_diff(dpath, 2,
6973dcae
JH
147 revs->dense_combined_merges,
148 revs);
b4b15503 149 free(dpath);
6973dcae 150 continue;
1b1480ff 151 }
b4b15503
FF
152 free(dpath);
153 dpath = NULL;
0e3994fa 154
6973dcae
JH
155 /*
156 * Show the diff for the 'ce' if we found the one
157 * from the desired stage.
158 */
e9c84099 159 diff_unmerge(&revs->diffopt, ce->name, 0, null_sha1);
6973dcae
JH
160 if (ce_stage(ce) != diff_unmerged_stage)
161 continue;
eeaa4603 162 }
6b14d7fa 163
125fd984 164 if (ce_uptodate(ce) || ce_skip_worktree(ce))
d1f2d7e8 165 continue;
f58dbf23 166
540e694b
NTND
167 /* If CE_VALID is set, don't look at workdir for file removal */
168 changed = (ce->ce_flags & CE_VALID) ? 0 : check_removed(ce, &st);
f58dbf23
JH
169 if (changed) {
170 if (changed < 0) {
6973dcae 171 perror(ce->name);
15d061b4
JH
172 continue;
173 }
6973dcae
JH
174 if (silent_on_removed)
175 continue;
7a51ed66 176 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
e3d42c47 177 ce->sha1, ce->name, 0);
6973dcae 178 continue;
f2ce9fde 179 }
fb63d7f8 180 changed = ce_match_stat(ce, &st, ce_option);
e3d42c47 181 if (S_ISGITLINK(ce->ce_mode)
4d34477f 182 && !DIFF_OPT_TST(&revs->diffopt, IGNORE_SUBMODULES)
e3d42c47
JL
183 && (!changed || (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
184 && is_submodule_modified(ce->name)) {
185 changed = 1;
186 dirty_submodule = 1;
187 }
8fa29602
JH
188 if (!changed) {
189 ce_mark_uptodate(ce);
190 if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
191 continue;
192 }
7a51ed66
LT
193 oldmode = ce->ce_mode;
194 newmode = ce_mode_from_stat(ce, st.st_mode);
6973dcae
JH
195 diff_change(&revs->diffopt, oldmode, newmode,
196 ce->sha1, (changed ? null_sha1 : ce->sha1),
e3d42c47 197 ce->name, 0, dirty_submodule);
77eb2720 198
7ca45252 199 }
6973dcae
JH
200 diffcore_std(&revs->diffopt);
201 diff_flush(&revs->diffopt);
202 return 0;
77eb2720 203}
be3cfa85 204
e09ad6e1
JH
205/*
206 * diff-index
207 */
208
209/* A file entry went away or appeared */
210static void diff_index_show_file(struct rev_info *revs,
211 const char *prefix,
212 struct cache_entry *ce,
e3d42c47
JL
213 const unsigned char *sha1, unsigned int mode,
214 unsigned dirty_submodule)
e09ad6e1 215{
7a51ed66 216 diff_addremove(&revs->diffopt, prefix[0], mode,
e3d42c47 217 sha1, ce->name, dirty_submodule);
e09ad6e1
JH
218}
219
220static int get_stat_data(struct cache_entry *ce,
c8c16f28 221 const unsigned char **sha1p,
e09ad6e1 222 unsigned int *modep,
e3d42c47 223 int cached, int match_missing,
4d34477f 224 unsigned *dirty_submodule, struct diff_options *diffopt)
e09ad6e1 225{
c8c16f28 226 const unsigned char *sha1 = ce->sha1;
e09ad6e1
JH
227 unsigned int mode = ce->ce_mode;
228
658dd48c 229 if (!cached && !ce_uptodate(ce)) {
e09ad6e1
JH
230 int changed;
231 struct stat st;
c40641b7 232 changed = check_removed(ce, &st);
948dd346
JH
233 if (changed < 0)
234 return -1;
235 else if (changed) {
236 if (match_missing) {
e09ad6e1
JH
237 *sha1p = sha1;
238 *modep = mode;
239 return 0;
240 }
241 return -1;
242 }
243 changed = ce_match_stat(ce, &st, 0);
e3d42c47 244 if (S_ISGITLINK(ce->ce_mode)
4d34477f
JL
245 && !DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES)
246 && (!changed || (diffopt->output_format & DIFF_FORMAT_PATCH))
e3d42c47
JL
247 && is_submodule_modified(ce->name)) {
248 changed = 1;
249 *dirty_submodule = 1;
250 }
251 if (changed) {
185c975f 252 mode = ce_mode_from_stat(ce, st.st_mode);
c8c16f28 253 sha1 = null_sha1;
e09ad6e1
JH
254 }
255 }
256
257 *sha1p = sha1;
258 *modep = mode;
259 return 0;
260}
261
ff7e6aad 262static void show_new_file(struct rev_info *revs,
e09ad6e1
JH
263 struct cache_entry *new,
264 int cached, int match_missing)
265{
c8c16f28 266 const unsigned char *sha1;
e09ad6e1 267 unsigned int mode;
e3d42c47 268 unsigned dirty_submodule = 0;
e09ad6e1 269
948dd346
JH
270 /*
271 * New file in the index: it might actually be different in
e09ad6e1
JH
272 * the working copy.
273 */
e3d42c47 274 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
4d34477f 275 &dirty_submodule, &revs->diffopt) < 0)
e09ad6e1
JH
276 return;
277
e3d42c47 278 diff_index_show_file(revs, "+", new, sha1, mode, dirty_submodule);
e09ad6e1
JH
279}
280
ff7e6aad 281static int show_modified(struct rev_info *revs,
e09ad6e1
JH
282 struct cache_entry *old,
283 struct cache_entry *new,
284 int report_missing,
285 int cached, int match_missing)
286{
287 unsigned int mode, oldmode;
c8c16f28 288 const unsigned char *sha1;
e3d42c47 289 unsigned dirty_submodule = 0;
e09ad6e1 290
e3d42c47 291 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
4d34477f 292 &dirty_submodule, &revs->diffopt) < 0) {
e09ad6e1
JH
293 if (report_missing)
294 diff_index_show_file(revs, "-", old,
e3d42c47 295 old->sha1, old->ce_mode, 0);
e09ad6e1
JH
296 return -1;
297 }
298
cb2b9f5e
PM
299 if (revs->combine_merges && !cached &&
300 (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
301 struct combine_diff_path *p;
302 int pathlen = ce_namelen(new);
303
304 p = xmalloc(combine_diff_path_size(2, pathlen));
305 p->path = (char *) &p->parent[2];
306 p->next = NULL;
307 p->len = pathlen;
308 memcpy(p->path, new->name, pathlen);
309 p->path[pathlen] = 0;
7a51ed66 310 p->mode = mode;
cb2b9f5e
PM
311 hashclr(p->sha1);
312 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
313 p->parent[0].status = DIFF_STATUS_MODIFIED;
7a51ed66 314 p->parent[0].mode = new->ce_mode;
cb2b9f5e
PM
315 hashcpy(p->parent[0].sha1, new->sha1);
316 p->parent[1].status = DIFF_STATUS_MODIFIED;
7a51ed66 317 p->parent[1].mode = old->ce_mode;
cb2b9f5e
PM
318 hashcpy(p->parent[1].sha1, old->sha1);
319 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
320 free(p);
321 return 0;
322 }
323
e09ad6e1 324 oldmode = old->ce_mode;
a89fccd2 325 if (mode == oldmode && !hashcmp(sha1, old->sha1) &&
8f67f8ae 326 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
e09ad6e1
JH
327 return 0;
328
e09ad6e1 329 diff_change(&revs->diffopt, oldmode, mode,
e3d42c47 330 old->sha1, sha1, old->name, 0, dirty_submodule);
e09ad6e1
JH
331 return 0;
332}
333
d1f2d7e8
LT
334/*
335 * This gets a mix of an existing index and a tree, one pathname entry
336 * at a time. The index entry may be a single stage-0 one, but it could
337 * also be multiple unmerged entries (in which case idx_pos/idx_nr will
338 * give you the position and number of entries in the index).
339 */
340static void do_oneway_diff(struct unpack_trees_options *o,
341 struct cache_entry *idx,
34110cd4 342 struct cache_entry *tree)
e09ad6e1 343{
ff7e6aad 344 struct rev_info *revs = o->unpack_data;
d1f2d7e8 345 int match_missing, cached;
5c21ac0e 346
540e694b 347 /* if the entry is not checked out, don't examine work tree */
b4d1690d
NTND
348 cached = o->index_only ||
349 (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx)));
a6080a0a 350 /*
5c21ac0e 351 * Backward compatibility wart - "diff-index -m" does
d1f2d7e8
LT
352 * not mean "do not ignore merges", but "match_missing".
353 *
354 * But with the revision flag parsing, that's found in
355 * "!revs->ignore_merges".
356 */
d1f2d7e8
LT
357 match_missing = !revs->ignore_merges;
358
359 if (cached && idx && ce_stage(idx)) {
29796c6c
JH
360 diff_unmerge(&revs->diffopt, idx->name, idx->ce_mode,
361 idx->sha1);
d1f2d7e8
LT
362 return;
363 }
364
365 /*
366 * Something added to the tree?
367 */
368 if (!tree) {
ff7e6aad 369 show_new_file(revs, idx, cached, match_missing);
d1f2d7e8
LT
370 return;
371 }
372
373 /*
374 * Something removed from the tree?
5c21ac0e 375 */
d1f2d7e8 376 if (!idx) {
e3d42c47 377 diff_index_show_file(revs, "-", tree, tree->sha1, tree->ce_mode, 0);
d1f2d7e8
LT
378 return;
379 }
380
381 /* Show difference between old and new */
ff7e6aad 382 show_modified(revs, tree, idx, 1, cached, match_missing);
d1f2d7e8
LT
383}
384
d1f2d7e8
LT
385/*
386 * The unpack_trees() interface is designed for merging, so
387 * the different source entries are designed primarily for
388 * the source trees, with the old index being really mainly
389 * used for being replaced by the result.
390 *
391 * For diffing, the index is more important, and we only have a
392 * single tree.
393 *
da8ba5e7 394 * We're supposed to advance o->pos to skip what we have already processed.
d1f2d7e8
LT
395 *
396 * This wrapper makes it all more readable, and takes care of all
397 * the fairly complex unpack_trees() semantic requirements, including
398 * the skipping, the path matching, the type conflict cases etc.
399 */
34110cd4 400static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o)
d1f2d7e8 401{
d1f2d7e8
LT
402 struct cache_entry *idx = src[0];
403 struct cache_entry *tree = src[1];
ff7e6aad 404 struct rev_info *revs = o->unpack_data;
d1f2d7e8 405
d1f2d7e8
LT
406 /*
407 * Unpack-trees generates a DF/conflict entry if
408 * there was a directory in the index and a tree
409 * in the tree. From a diff standpoint, that's a
410 * delete of the tree and a create of the file.
411 */
412 if (tree == o->df_conflict_entry)
413 tree = NULL;
414
415 if (ce_path_match(idx ? idx : tree, revs->prune_data))
34110cd4 416 do_oneway_diff(o, idx, tree);
d1f2d7e8 417
34110cd4 418 return 0;
d1f2d7e8
LT
419}
420
421int run_diff_index(struct rev_info *revs, int cached)
422{
423 struct object *ent;
424 struct tree *tree;
425 const char *tree_name;
426 struct unpack_trees_options opts;
427 struct tree_desc t;
e09ad6e1 428
1f1e895f
LT
429 ent = revs->pending.objects[0].item;
430 tree_name = revs->pending.objects[0].name;
e09ad6e1
JH
431 tree = parse_tree_indirect(ent->sha1);
432 if (!tree)
433 return error("bad tree object %s", tree_name);
d1f2d7e8
LT
434
435 memset(&opts, 0, sizeof(opts));
436 opts.head_idx = 1;
437 opts.index_only = cached;
a0919ced
JH
438 opts.diff_index_cached = (cached &&
439 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER));
d1f2d7e8
LT
440 opts.merge = 1;
441 opts.fn = oneway_diff;
ff7e6aad 442 opts.unpack_data = revs;
34110cd4
LT
443 opts.src_index = &the_index;
444 opts.dst_index = NULL;
d1f2d7e8
LT
445
446 init_tree_desc(&t, tree->buffer, tree->size);
203a2fe1
DB
447 if (unpack_trees(1, &t, &opts))
448 exit(128);
d1f2d7e8 449
a5a818ee 450 diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
730f7284 451 diffcore_fix_diff_index(&revs->diffopt);
e09ad6e1
JH
452 diffcore_std(&revs->diffopt);
453 diff_flush(&revs->diffopt);
d1f2d7e8 454 return 0;
e09ad6e1 455}
1cfe7733
JH
456
457int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
458{
459 struct tree *tree;
460 struct rev_info revs;
461 int i;
462 struct cache_entry **dst;
463 struct cache_entry *last = NULL;
204ce979
JS
464 struct unpack_trees_options opts;
465 struct tree_desc t;
1cfe7733
JH
466
467 /*
468 * This is used by git-blame to run diff-cache internally;
469 * it potentially needs to repeatedly run this, so we will
470 * start by removing the higher order entries the last round
471 * left behind.
472 */
473 dst = active_cache;
474 for (i = 0; i < active_nr; i++) {
475 struct cache_entry *ce = active_cache[i];
476 if (ce_stage(ce)) {
477 if (last && !strcmp(ce->name, last->name))
478 continue;
479 cache_tree_invalidate_path(active_cache_tree,
480 ce->name);
481 last = ce;
7a51ed66 482 ce->ce_flags |= CE_REMOVE;
1cfe7733
JH
483 }
484 *dst++ = ce;
485 }
486 active_nr = dst - active_cache;
487
488 init_revisions(&revs, NULL);
489 revs.prune_data = opt->paths;
490 tree = parse_tree_indirect(tree_sha1);
491 if (!tree)
492 die("bad tree object %s", sha1_to_hex(tree_sha1));
204ce979
JS
493
494 memset(&opts, 0, sizeof(opts));
495 opts.head_idx = 1;
496 opts.index_only = 1;
a0919ced 497 opts.diff_index_cached = !DIFF_OPT_TST(opt, FIND_COPIES_HARDER);
204ce979
JS
498 opts.merge = 1;
499 opts.fn = oneway_diff;
ff7e6aad 500 opts.unpack_data = &revs;
34110cd4
LT
501 opts.src_index = &the_index;
502 opts.dst_index = &the_index;
204ce979
JS
503
504 init_tree_desc(&t, tree->buffer, tree->size);
203a2fe1
DB
505 if (unpack_trees(1, &t, &opts))
506 exit(128);
204ce979 507 return 0;
1cfe7733 508}
75f3ff2e
SB
509
510int index_differs_from(const char *def, int diff_flags)
511{
512 struct rev_info rev;
513
514 init_revisions(&rev, NULL);
515 setup_revisions(0, NULL, &rev, def);
90b19941 516 DIFF_OPT_SET(&rev.diffopt, QUICK);
75f3ff2e
SB
517 DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
518 rev.diffopt.flags |= diff_flags;
519 run_diff_index(&rev, 1);
520 if (rev.pending.alloc)
521 free(rev.pending.objects);
522 return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0);
523}