blob: 62f4cd94cfbc4d3fe9e46c84f318af6624349a48 [file] [log] [blame]
Junio C Hamanobe3cfa82005-04-26 09:25:05 -07001/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
Junio C Hamano86436c22005-04-25 18:22:47 -07004#include "cache.h"
Junio C Hamano6fb737b2005-07-07 23:58:32 -07005#include "quote.h"
Junio C Hamano6973dca2006-04-21 23:57:45 -07006#include "commit.h"
Junio C Hamano86436c22005-04-25 18:22:47 -07007#include "diff.h"
Junio C Hamano427dcb42005-05-21 02:39:09 -07008#include "diffcore.h"
Junio C Hamano6973dca2006-04-21 23:57:45 -07009#include "revision.h"
Junio C Hamano1cfe7732007-01-30 01:11:08 -080010#include "cache-tree.h"
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -080011#include "unpack-trees.h"
Junio C Hamano948dd342008-03-30 17:29:48 -070012#include "refs.h"
Jens Lehmannee6fc512010-01-16 18:42:24 +010013#include "submodule.h"
Junio C Hamano427dcb42005-05-21 02:39:09 -070014
Junio C Hamanob46f0b62005-05-04 01:45:24 -070015/*
Junio C Hamano6973dca2006-04-21 23:57:45 -070016 * diff-files
Junio C Hamanob46f0b62005-05-04 01:45:24 -070017 */
Junio C Hamano6973dca2006-04-21 23:57:45 -070018
Junio C Hamano948dd342008-03-30 17:29:48 -070019/*
Junio C Hamano1392a372008-05-03 17:04:42 -070020 * 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.
Junio C Hamano948dd342008-03-30 17:29:48 -070027 */
Linus Torvaldsc40641b2008-05-09 09:21:07 -070028static int check_removed(const struct cache_entry *ce, struct stat *st)
Junio C Hamano948dd342008-03-30 17:29:48 -070029{
30 if (lstat(ce->name, st) < 0) {
31 if (errno != ENOENT && errno != ENOTDIR)
32 return -1;
33 return 1;
34 }
Kjetil Barvik57199892009-02-09 21:54:06 +010035 if (has_symlink_leading_path(ce->name, ce_namelen(ce)))
Junio C Hamano948dd342008-03-30 17:29:48 -070036 return 1;
37 if (S_ISDIR(st->st_mode)) {
38 unsigned char sub[20];
Junio C Hamano1392a372008-05-03 17:04:42 -070039
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))
Junio C Hamano948dd342008-03-30 17:29:48 -070053 return 1;
54 }
55 return 0;
56}
Johannes Schindelind516c2d2007-02-22 21:50:10 +010057
Jens Lehmannae6d5c12010-03-11 22:50:25 +010058/*
59 * Has a file changed or has a submodule new commits or a dirty work tree?
60 *
61 * Return 1 when changes are detected, 0 otherwise. If the DIRTY_SUBMODULES
62 * option is set, the caller does not only want to know if a submodule is
63 * modified at all but wants to know all the conditions that are met (new
64 * commits, untracked content and/or modified content).
65 */
66static int match_stat_with_submodule(struct diff_options *diffopt,
67 struct cache_entry *ce, struct stat *st,
68 unsigned ce_option, unsigned *dirty_submodule)
69{
70 int changed = ce_match_stat(ce, st, ce_option);
Jens Lehmannaee9c7d2010-08-06 00:39:25 +020071 if (S_ISGITLINK(ce->ce_mode)) {
72 unsigned orig_flags = diffopt->flags;
73 if (!DIFF_OPT_TST(diffopt, OVERRIDE_SUBMODULE_CONFIG))
74 set_diffopt_flags_from_submodule_config(diffopt, ce->name);
75 if (DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES))
76 changed = 0;
77 else if (!DIFF_OPT_TST(diffopt, IGNORE_DIRTY_SUBMODULES)
78 && (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES)))
79 *dirty_submodule = is_submodule_modified(ce->name, DIFF_OPT_TST(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES));
80 diffopt->flags = orig_flags;
Jens Lehmannae6d5c12010-03-11 22:50:25 +010081 }
82 return changed;
83}
84
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -080085int run_diff_files(struct rev_info *revs, unsigned int option)
Junio C Hamanob46f0b62005-05-04 01:45:24 -070086{
Junio C Hamano6973dca2006-04-21 23:57:45 -070087 int entries, i;
88 int diff_unmerged_stage = revs->max_count;
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -080089 int silent_on_removed = option & DIFF_SILENT_ON_REMOVED;
Junio C Hamanofb63d7f2007-11-09 18:22:52 -080090 unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
91 ? CE_MATCH_RACY_IS_DIRTY : 0);
Junio C Hamano5c975582005-05-19 03:32:35 -070092
Junio C Hamanoa5a818e2008-08-18 20:08:09 -070093 diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
94
Junio C Hamano6973dca2006-04-21 23:57:45 -070095 if (diff_unmerged_stage < 0)
96 diff_unmerged_stage = 2;
Junio C Hamanob4e1e4a2007-02-09 18:51:40 -080097 entries = active_nr;
Junio C Hamano6973dca2006-04-21 23:57:45 -070098 for (i = 0; i < entries; i++) {
Junio C Hamano427dcb42005-05-21 02:39:09 -070099 struct stat st;
Junio C Hamano6973dca2006-04-21 23:57:45 -0700100 unsigned int oldmode, newmode;
101 struct cache_entry *ce = active_cache[i];
102 int changed;
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100103 unsigned dirty_submodule = 0;
Junio C Hamanof0c6b2a2005-05-27 15:56:38 -0700104
Junio C Hamano28b92642011-05-31 09:14:17 -0700105 if (diff_can_quit_early(&revs->diffopt))
Junio C Hamano822cac02007-03-14 11:12:51 -0700106 break;
107
Nguyễn Thái Ngọc Duyeb9cb552010-12-17 19:43:07 +0700108 if (!ce_path_match(ce, &revs->prune_data))
Linus Torvalds8676eb42006-02-26 15:51:24 -0800109 continue;
Linus Torvalds8676eb42006-02-26 15:51:24 -0800110
Junio C Hamano6973dca2006-04-21 23:57:45 -0700111 if (ce_stage(ce)) {
Florian Forsterb4b15502006-06-18 17:18:05 +0200112 struct combine_diff_path *dpath;
Junio C Hamano095ce952011-04-22 16:19:27 -0700113 struct diff_filepair *pair;
114 unsigned int wt_mode = 0;
Junio C Hamano6973dca2006-04-21 23:57:45 -0700115 int num_compare_stages = 0;
Florian Forsterb4b15502006-06-18 17:18:05 +0200116 size_t path_len;
Linus Torvalds8676eb42006-02-26 15:51:24 -0800117
Florian Forsterb4b15502006-06-18 17:18:05 +0200118 path_len = ce_namelen(ce);
119
Junio C Hamano4fc970c2007-02-25 22:24:47 -0800120 dpath = xmalloc(combine_diff_path_size(5, path_len));
Florian Forsterb4b15502006-06-18 17:18:05 +0200121 dpath->path = (char *) &(dpath->parent[5]);
122
123 dpath->next = NULL;
124 dpath->len = path_len;
125 memcpy(dpath->path, ce->name, path_len);
126 dpath->path[path_len] = '\0';
Junio C Hamanoa8e0d162006-08-23 13:57:23 -0700127 hashclr(dpath->sha1);
Florian Forsterb4b15502006-06-18 17:18:05 +0200128 memset(&(dpath->parent[0]), 0,
Junio C Hamano4fc970c2007-02-25 22:24:47 -0800129 sizeof(struct combine_diff_parent)*5);
130
Linus Torvaldsc40641b2008-05-09 09:21:07 -0700131 changed = check_removed(ce, &st);
Junio C Hamanof58dbf22008-03-30 17:30:08 -0700132 if (!changed)
Junio C Hamano095ce952011-04-22 16:19:27 -0700133 wt_mode = ce_mode_from_stat(ce, st.st_mode);
Junio C Hamanof58dbf22008-03-30 17:30:08 -0700134 else {
135 if (changed < 0) {
Junio C Hamano4fc970c2007-02-25 22:24:47 -0800136 perror(ce->name);
137 continue;
138 }
139 if (silent_on_removed)
140 continue;
Junio C Hamano095ce952011-04-22 16:19:27 -0700141 wt_mode = 0;
Junio C Hamano4fc970c2007-02-25 22:24:47 -0800142 }
Junio C Hamano095ce952011-04-22 16:19:27 -0700143 dpath->mode = wt_mode;
Junio C Hamanobe3cfa82005-04-26 09:25:05 -0700144
Junio C Hamano6973dca2006-04-21 23:57:45 -0700145 while (i < entries) {
146 struct cache_entry *nce = active_cache[i];
147 int stage;
Junio C Hamanobe3cfa82005-04-26 09:25:05 -0700148
Junio C Hamano6973dca2006-04-21 23:57:45 -0700149 if (strcmp(ce->name, nce->name))
150 break;
Junio C Hamanobe3cfa82005-04-26 09:25:05 -0700151
Junio C Hamano6973dca2006-04-21 23:57:45 -0700152 /* Stage #2 (ours) is the first parent,
153 * stage #3 (theirs) is the second.
154 */
155 stage = ce_stage(nce);
156 if (2 <= stage) {
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800157 int mode = nce->ce_mode;
Junio C Hamano6973dca2006-04-21 23:57:45 -0700158 num_compare_stages++;
Shawn Pearcee7024962006-08-23 02:49:00 -0400159 hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800160 dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode);
Florian Forsterb4b15502006-06-18 17:18:05 +0200161 dpath->parent[stage-2].status =
Junio C Hamano6973dca2006-04-21 23:57:45 -0700162 DIFF_STATUS_MODIFIED;
163 }
Junio C Hamanocebff982006-03-25 23:12:17 -0800164
Junio C Hamano6973dca2006-04-21 23:57:45 -0700165 /* diff against the proper unmerged stage */
166 if (stage == diff_unmerged_stage)
167 ce = nce;
168 i++;
H. Peter Anvin1b1480f2005-11-21 14:17:12 -0800169 }
Junio C Hamano6973dca2006-04-21 23:57:45 -0700170 /*
171 * Compensate for loop update
172 */
173 i--;
Junio C Hamano0e3994f2005-06-03 01:37:54 -0700174
Junio C Hamano6973dca2006-04-21 23:57:45 -0700175 if (revs->combine_merges && num_compare_stages == 2) {
Florian Forsterb4b15502006-06-18 17:18:05 +0200176 show_combined_diff(dpath, 2,
Junio C Hamano6973dca2006-04-21 23:57:45 -0700177 revs->dense_combined_merges,
178 revs);
Florian Forsterb4b15502006-06-18 17:18:05 +0200179 free(dpath);
Junio C Hamano15d061b2005-05-27 15:55:55 -0700180 continue;
181 }
Florian Forsterb4b15502006-06-18 17:18:05 +0200182 free(dpath);
183 dpath = NULL;
Junio C Hamano6973dca2006-04-21 23:57:45 -0700184
185 /*
186 * Show the diff for the 'ce' if we found the one
187 * from the desired stage.
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700188 */
Junio C Hamano095ce952011-04-22 16:19:27 -0700189 pair = diff_unmerge(&revs->diffopt, ce->name);
190 if (wt_mode)
191 pair->two->mode = wt_mode;
Junio C Hamano6973dca2006-04-21 23:57:45 -0700192 if (ce_stage(ce) != diff_unmerged_stage)
193 continue;
194 }
195
Junio C Hamano125fd982010-01-24 00:10:20 -0800196 if (ce_uptodate(ce) || ce_skip_worktree(ce))
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800197 continue;
Junio C Hamanof58dbf22008-03-30 17:30:08 -0700198
Nguyễn Thái Ngọc Duy540e6942009-08-11 22:43:59 +0700199 /* If CE_VALID is set, don't look at workdir for file removal */
200 changed = (ce->ce_flags & CE_VALID) ? 0 : check_removed(ce, &st);
Junio C Hamanof58dbf22008-03-30 17:30:08 -0700201 if (changed) {
202 if (changed < 0) {
Junio C Hamano6973dca2006-04-21 23:57:45 -0700203 perror(ce->name);
204 continue;
Junio C Hamano25d5ea42005-05-24 01:10:48 -0700205 }
Junio C Hamano6973dca2006-04-21 23:57:45 -0700206 if (silent_on_removed)
207 continue;
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800208 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100209 ce->sha1, ce->name, 0);
Junio C Hamano6973dca2006-04-21 23:57:45 -0700210 continue;
Junio C Hamanobceafe72005-05-23 18:14:03 -0700211 }
Jens Lehmannae6d5c12010-03-11 22:50:25 +0100212 changed = match_stat_with_submodule(&revs->diffopt, ce, &st,
213 ce_option, &dirty_submodule);
Jens Lehmann85adbf22010-03-12 22:23:52 +0100214 if (!changed && !dirty_submodule) {
Junio C Hamano8fa29602008-03-30 12:39:25 -0700215 ce_mark_uptodate(ce);
216 if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
217 continue;
218 }
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800219 oldmode = ce->ce_mode;
220 newmode = ce_mode_from_stat(ce, st.st_mode);
Junio C Hamano6973dca2006-04-21 23:57:45 -0700221 diff_change(&revs->diffopt, oldmode, newmode,
222 ce->sha1, (changed ? null_sha1 : ce->sha1),
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100223 ce->name, 0, dirty_submodule);
Junio C Hamano6973dca2006-04-21 23:57:45 -0700224
Junio C Hamanobceafe72005-05-23 18:14:03 -0700225 }
Junio C Hamano6973dca2006-04-21 23:57:45 -0700226 diffcore_std(&revs->diffopt);
227 diff_flush(&revs->diffopt);
228 return 0;
Junio C Hamanobceafe72005-05-23 18:14:03 -0700229}
230
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700231/*
232 * diff-index
233 */
234
235/* A file entry went away or appeared */
236static void diff_index_show_file(struct rev_info *revs,
237 const char *prefix,
238 struct cache_entry *ce,
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100239 const unsigned char *sha1, unsigned int mode,
240 unsigned dirty_submodule)
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700241{
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800242 diff_addremove(&revs->diffopt, prefix[0], mode,
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100243 sha1, ce->name, dirty_submodule);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700244}
245
246static int get_stat_data(struct cache_entry *ce,
Junio C Hamanoc8c16f22008-03-02 00:57:26 -0800247 const unsigned char **sha1p,
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700248 unsigned int *modep,
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100249 int cached, int match_missing,
Jens Lehmann4d344772010-01-23 17:37:26 +0100250 unsigned *dirty_submodule, struct diff_options *diffopt)
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700251{
Junio C Hamanoc8c16f22008-03-02 00:57:26 -0800252 const unsigned char *sha1 = ce->sha1;
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700253 unsigned int mode = ce->ce_mode;
254
Linus Torvalds658dd482009-05-09 14:57:30 -0700255 if (!cached && !ce_uptodate(ce)) {
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700256 int changed;
257 struct stat st;
Linus Torvaldsc40641b2008-05-09 09:21:07 -0700258 changed = check_removed(ce, &st);
Junio C Hamano948dd342008-03-30 17:29:48 -0700259 if (changed < 0)
260 return -1;
261 else if (changed) {
262 if (match_missing) {
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700263 *sha1p = sha1;
264 *modep = mode;
265 return 0;
266 }
267 return -1;
268 }
Jens Lehmannae6d5c12010-03-11 22:50:25 +0100269 changed = match_stat_with_submodule(diffopt, ce, &st,
270 0, dirty_submodule);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700271 if (changed) {
Junio C Hamano185c9752007-02-16 22:43:48 -0800272 mode = ce_mode_from_stat(ce, st.st_mode);
Junio C Hamanoc8c16f22008-03-02 00:57:26 -0800273 sha1 = null_sha1;
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700274 }
275 }
276
277 *sha1p = sha1;
278 *modep = mode;
279 return 0;
280}
281
Kjetil Barvikff7e6aa2009-01-11 19:36:42 +0100282static void show_new_file(struct rev_info *revs,
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700283 struct cache_entry *new,
284 int cached, int match_missing)
285{
Junio C Hamanoc8c16f22008-03-02 00:57:26 -0800286 const unsigned char *sha1;
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700287 unsigned int mode;
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100288 unsigned dirty_submodule = 0;
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700289
Junio C Hamano948dd342008-03-30 17:29:48 -0700290 /*
291 * New file in the index: it might actually be different in
Carlos Martín Nietof7d650c2011-09-20 22:25:57 +0200292 * the working tree.
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700293 */
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100294 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
Jens Lehmann4d344772010-01-23 17:37:26 +0100295 &dirty_submodule, &revs->diffopt) < 0)
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700296 return;
297
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100298 diff_index_show_file(revs, "+", new, sha1, mode, dirty_submodule);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700299}
300
Kjetil Barvikff7e6aa2009-01-11 19:36:42 +0100301static int show_modified(struct rev_info *revs,
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700302 struct cache_entry *old,
303 struct cache_entry *new,
304 int report_missing,
305 int cached, int match_missing)
306{
307 unsigned int mode, oldmode;
Junio C Hamanoc8c16f22008-03-02 00:57:26 -0800308 const unsigned char *sha1;
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100309 unsigned dirty_submodule = 0;
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700310
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100311 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
Jens Lehmann4d344772010-01-23 17:37:26 +0100312 &dirty_submodule, &revs->diffopt) < 0) {
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700313 if (report_missing)
314 diff_index_show_file(revs, "-", old,
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100315 old->sha1, old->ce_mode, 0);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700316 return -1;
317 }
318
Paul Mackerrascb2b9f52006-09-04 21:38:40 +1000319 if (revs->combine_merges && !cached &&
320 (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
321 struct combine_diff_path *p;
322 int pathlen = ce_namelen(new);
323
324 p = xmalloc(combine_diff_path_size(2, pathlen));
325 p->path = (char *) &p->parent[2];
326 p->next = NULL;
327 p->len = pathlen;
328 memcpy(p->path, new->name, pathlen);
329 p->path[pathlen] = 0;
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800330 p->mode = mode;
Paul Mackerrascb2b9f52006-09-04 21:38:40 +1000331 hashclr(p->sha1);
332 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
333 p->parent[0].status = DIFF_STATUS_MODIFIED;
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800334 p->parent[0].mode = new->ce_mode;
Paul Mackerrascb2b9f52006-09-04 21:38:40 +1000335 hashcpy(p->parent[0].sha1, new->sha1);
336 p->parent[1].status = DIFF_STATUS_MODIFIED;
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800337 p->parent[1].mode = old->ce_mode;
Paul Mackerrascb2b9f52006-09-04 21:38:40 +1000338 hashcpy(p->parent[1].sha1, old->sha1);
339 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
340 free(p);
341 return 0;
342 }
343
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700344 oldmode = old->ce_mode;
Jens Lehmann85adbf22010-03-12 22:23:52 +0100345 if (mode == oldmode && !hashcmp(sha1, old->sha1) && !dirty_submodule &&
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100346 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700347 return 0;
348
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700349 diff_change(&revs->diffopt, oldmode, mode,
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100350 old->sha1, sha1, old->name, 0, dirty_submodule);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700351 return 0;
352}
353
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700354/*
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800355 * This gets a mix of an existing index and a tree, one pathname entry
356 * at a time. The index entry may be a single stage-0 one, but it could
357 * also be multiple unmerged entries (in which case idx_pos/idx_nr will
358 * give you the position and number of entries in the index).
359 */
360static void do_oneway_diff(struct unpack_trees_options *o,
361 struct cache_entry *idx,
Linus Torvalds34110cd2008-03-06 18:12:28 -0800362 struct cache_entry *tree)
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700363{
Kjetil Barvikff7e6aa2009-01-11 19:36:42 +0100364 struct rev_info *revs = o->unpack_data;
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800365 int match_missing, cached;
Junio C Hamano5c21ac02006-04-22 03:58:04 -0700366
Nguyễn Thái Ngọc Duy540e6942009-08-11 22:43:59 +0700367 /* if the entry is not checked out, don't examine work tree */
Nguyễn Thái Ngọc Duyb4d16902009-08-20 20:46:58 +0700368 cached = o->index_only ||
369 (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx)));
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700370 /*
Junio C Hamano5c21ac02006-04-22 03:58:04 -0700371 * Backward compatibility wart - "diff-index -m" does
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800372 * not mean "do not ignore merges", but "match_missing".
373 *
374 * But with the revision flag parsing, that's found in
375 * "!revs->ignore_merges".
Junio C Hamano5c21ac02006-04-22 03:58:04 -0700376 */
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800377 match_missing = !revs->ignore_merges;
378
379 if (cached && idx && ce_stage(idx)) {
Junio C Hamanofa7b2902011-04-22 16:05:58 -0700380 struct diff_filepair *pair;
381 pair = diff_unmerge(&revs->diffopt, idx->name);
Junio C Hamanoff00b682011-07-13 21:36:29 -0700382 if (tree)
383 fill_filespec(pair->one, tree->sha1, tree->ce_mode);
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800384 return;
385 }
386
387 /*
388 * Something added to the tree?
389 */
390 if (!tree) {
Kjetil Barvikff7e6aa2009-01-11 19:36:42 +0100391 show_new_file(revs, idx, cached, match_missing);
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800392 return;
393 }
394
395 /*
396 * Something removed from the tree?
397 */
398 if (!idx) {
Jens Lehmanne3d42c42010-01-18 21:26:18 +0100399 diff_index_show_file(revs, "-", tree, tree->sha1, tree->ce_mode, 0);
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800400 return;
401 }
402
403 /* Show difference between old and new */
Kjetil Barvikff7e6aa2009-01-11 19:36:42 +0100404 show_modified(revs, tree, idx, 1, cached, match_missing);
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800405}
406
407/*
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800408 * The unpack_trees() interface is designed for merging, so
409 * the different source entries are designed primarily for
410 * the source trees, with the old index being really mainly
411 * used for being replaced by the result.
412 *
413 * For diffing, the index is more important, and we only have a
414 * single tree.
415 *
Junio C Hamanoda8ba5e2009-09-17 22:12:17 -0700416 * We're supposed to advance o->pos to skip what we have already processed.
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800417 *
418 * This wrapper makes it all more readable, and takes care of all
419 * the fairly complex unpack_trees() semantic requirements, including
420 * the skipping, the path matching, the type conflict cases etc.
421 */
Linus Torvalds34110cd2008-03-06 18:12:28 -0800422static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o)
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800423{
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800424 struct cache_entry *idx = src[0];
425 struct cache_entry *tree = src[1];
Kjetil Barvikff7e6aa2009-01-11 19:36:42 +0100426 struct rev_info *revs = o->unpack_data;
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800427
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800428 /*
429 * Unpack-trees generates a DF/conflict entry if
430 * there was a directory in the index and a tree
431 * in the tree. From a diff standpoint, that's a
432 * delete of the tree and a create of the file.
433 */
434 if (tree == o->df_conflict_entry)
435 tree = NULL;
436
Junio C Hamanob4194822011-05-31 10:06:44 -0700437 if (ce_path_match(idx ? idx : tree, &revs->prune_data)) {
Linus Torvalds34110cd2008-03-06 18:12:28 -0800438 do_oneway_diff(o, idx, tree);
Junio C Hamanob4194822011-05-31 10:06:44 -0700439 if (diff_can_quit_early(&revs->diffopt)) {
440 o->exiting_early = 1;
441 return -1;
442 }
443 }
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800444
Linus Torvalds34110cd2008-03-06 18:12:28 -0800445 return 0;
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800446}
447
Junio C Hamanobf979c02011-07-13 18:57:42 -0700448static int diff_cache(struct rev_info *revs,
449 const unsigned char *tree_sha1,
450 const char *tree_name,
451 int cached)
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800452{
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800453 struct tree *tree;
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800454 struct tree_desc t;
Junio C Hamanobf979c02011-07-13 18:57:42 -0700455 struct unpack_trees_options opts;
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700456
Junio C Hamanobf979c02011-07-13 18:57:42 -0700457 tree = parse_tree_indirect(tree_sha1);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700458 if (!tree)
Junio C Hamanobf979c02011-07-13 18:57:42 -0700459 return error("bad tree object %s",
460 tree_name ? tree_name : sha1_to_hex(tree_sha1));
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800461 memset(&opts, 0, sizeof(opts));
462 opts.head_idx = 1;
463 opts.index_only = cached;
Junio C Hamanoa0919ce2009-05-22 23:14:25 -0700464 opts.diff_index_cached = (cached &&
465 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER));
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800466 opts.merge = 1;
467 opts.fn = oneway_diff;
Kjetil Barvikff7e6aa2009-01-11 19:36:42 +0100468 opts.unpack_data = revs;
Linus Torvalds34110cd2008-03-06 18:12:28 -0800469 opts.src_index = &the_index;
470 opts.dst_index = NULL;
Junio C Hamano2f88c192011-08-29 13:34:08 -0700471 opts.pathspec = &revs->diffopt.pathspec;
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800472
473 init_tree_desc(&t, tree->buffer, tree->size);
Junio C Hamanobf979c02011-07-13 18:57:42 -0700474 return unpack_trees(1, &t, &opts);
475}
476
477int run_diff_index(struct rev_info *revs, int cached)
478{
479 struct object_array_entry *ent;
480
481 ent = revs->pending.objects;
482 if (diff_cache(revs, ent->item->sha1, ent->name, cached))
Daniel Barkalow203a2fe2008-02-07 11:39:48 -0500483 exit(128);
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800484
Junio C Hamanoa5a818e2008-08-18 20:08:09 -0700485 diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
Junio C Hamano730f7282009-09-20 00:03:39 -0700486 diffcore_fix_diff_index(&revs->diffopt);
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700487 diffcore_std(&revs->diffopt);
488 diff_flush(&revs->diffopt);
Linus Torvaldsd1f2d7e2008-01-19 17:27:12 -0800489 return 0;
Junio C Hamanoe09ad6e2006-04-22 02:43:00 -0700490}
Junio C Hamano1cfe7732007-01-30 01:11:08 -0800491
492int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
493{
Junio C Hamano1cfe7732007-01-30 01:11:08 -0800494 struct rev_info revs;
Junio C Hamano1cfe7732007-01-30 01:11:08 -0800495
496 init_revisions(&revs, NULL);
Nguyễn Thái Ngọc Duyafe069d2010-12-17 19:43:06 +0700497 init_pathspec(&revs.prune_data, opt->pathspec.raw);
Junio C Hamanobf979c02011-07-13 18:57:42 -0700498 revs.diffopt = *opt;
Johannes Schindelin204ce972008-01-20 15:19:56 +0000499
Junio C Hamanobf979c02011-07-13 18:57:42 -0700500 if (diff_cache(&revs, tree_sha1, NULL, 1))
Daniel Barkalow203a2fe2008-02-07 11:39:48 -0500501 exit(128);
Johannes Schindelin204ce972008-01-20 15:19:56 +0000502 return 0;
Junio C Hamano1cfe7732007-01-30 01:11:08 -0800503}
Stephan Beyer75f3ff22009-02-10 15:30:35 +0100504
505int index_differs_from(const char *def, int diff_flags)
506{
507 struct rev_info rev;
Junio C Hamano32962c92010-03-08 22:58:09 -0800508 struct setup_revision_opt opt;
Stephan Beyer75f3ff22009-02-10 15:30:35 +0100509
510 init_revisions(&rev, NULL);
Junio C Hamano32962c92010-03-08 22:58:09 -0800511 memset(&opt, 0, sizeof(opt));
512 opt.def = def;
513 setup_revisions(0, NULL, &rev, &opt);
Junio C Hamano90b19942009-05-23 01:15:35 -0700514 DIFF_OPT_SET(&rev.diffopt, QUICK);
Stephan Beyer75f3ff22009-02-10 15:30:35 +0100515 DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
516 rev.diffopt.flags |= diff_flags;
517 run_diff_index(&rev, 1);
518 if (rev.pending.alloc)
519 free(rev.pending.objects);
520 return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0);
521}