🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v1.7.0.3 / . / diff-lib.c
blob: d7e13cb177a3c345eb076a9ffede87c6e6afa367 [file] [log] [blame]
Junio C Hamanobe3cfa82005-04-26 16:25:05[diff] [blame]1/*
2 * Copyright (C) 2005 Junio C Hamano
3 */
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]4#include "cache.h"
Junio C Hamano6fb737b2005-07-08 06:58:32[diff] [blame]5#include "quote.h"
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]6#include "commit.h"
Junio C Hamano86436c22005-04-26 01:22:47[diff] [blame]7#include "diff.h"
Junio C Hamano427dcb42005-05-21 09:39:09[diff] [blame]8#include "diffcore.h"
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]9#include "revision.h"
Junio C Hamano1cfe7732007-01-30 09:11:08[diff] [blame]10#include "cache-tree.h"
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]11#include "unpack-trees.h"
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]12#include "refs.h"
Jens Lehmannee6fc512010-01-16 17:42:24[diff] [blame]13#include "submodule.h"
Junio C Hamano427dcb42005-05-21 09:39:09[diff] [blame]14
Junio C Hamanob46f0b62005-05-04 08:45:24[diff] [blame]15/*
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]16 * diff-files
Junio C Hamanob46f0b62005-05-04 08:45:24[diff] [blame]17 */
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]18
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]19/*
Junio C Hamano1392a372008-05-04 00:04:42[diff] [blame]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.
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]27 */
Linus Torvaldsc40641b2008-05-09 16:21:07[diff] [blame]28static int check_removed(const struct cache_entry *ce, struct stat *st)
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]29{
30 if (lstat(ce->name, st) < 0) {
31 if (errno != ENOENT && errno != ENOTDIR)
32 return -1;
33 return 1;
34 }
Kjetil Barvik57199892009-02-09 20:54:06[diff] [blame]35 if (has_symlink_leading_path(ce->name, ce_namelen(ce)))
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]36 return 1;
37 if (S_ISDIR(st->st_mode)) {
38 unsigned char sub[20];
Junio C Hamano1392a372008-05-04 00:04:42[diff] [blame]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))
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]53 return 1;
54 }
55 return 0;
56}
Johannes Schindelind516c2d2007-02-22 20:50:10[diff] [blame]57
Junio C Hamano4bd5b7d2007-11-10 08:15:03[diff] [blame]58int run_diff_files(struct rev_info *revs, unsigned int option)
Junio C Hamanob46f0b62005-05-04 08:45:24[diff] [blame]59{
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]60 int entries, i;
61 int diff_unmerged_stage = revs->max_count;
Junio C Hamano4bd5b7d2007-11-10 08:15:03[diff] [blame]62 int silent_on_removed = option & DIFF_SILENT_ON_REMOVED;
Junio C Hamanofb63d7f2007-11-10 02:22:52[diff] [blame]63 unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
64 ? CE_MATCH_RACY_IS_DIRTY : 0);
Junio C Hamano5c975582005-05-19 10:32:35[diff] [blame]65
Junio C Hamanoa5a818e2008-08-19 03:08:09[diff] [blame]66 diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
67
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]68 if (diff_unmerged_stage < 0)
69 diff_unmerged_stage = 2;
Junio C Hamanob4e1e4a2007-02-10 02:51:40[diff] [blame]70 entries = active_nr;
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]71 for (i = 0; i < entries; i++) {
Junio C Hamano427dcb42005-05-21 09:39:09[diff] [blame]72 struct stat st;
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]73 unsigned int oldmode, newmode;
74 struct cache_entry *ce = active_cache[i];
75 int changed;
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]76 unsigned dirty_submodule = 0;
Junio C Hamanof0c6b2a2005-05-27 22:56:38[diff] [blame]77
Junio C Hamano90b19942009-05-23 08:15:35[diff] [blame]78 if (DIFF_OPT_TST(&revs->diffopt, QUICK) &&
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]79 DIFF_OPT_TST(&revs->diffopt, HAS_CHANGES))
Junio C Hamano822cac02007-03-14 18:12:51[diff] [blame]80 break;
81
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]82 if (!ce_path_match(ce, revs->prune_data))
Linus Torvalds8676eb42006-02-26 23:51:24[diff] [blame]83 continue;
Linus Torvalds8676eb42006-02-26 23:51:24[diff] [blame]84
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]85 if (ce_stage(ce)) {
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]86 struct combine_diff_path *dpath;
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]87 int num_compare_stages = 0;
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]88 size_t path_len;
Linus Torvalds8676eb42006-02-26 23:51:24[diff] [blame]89
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]90 path_len = ce_namelen(ce);
91
Junio C Hamano4fc970c2007-02-26 06:24:47[diff] [blame]92 dpath = xmalloc(combine_diff_path_size(5, path_len));
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]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';
Junio C Hamanoa8e0d162006-08-23 20:57:23[diff] [blame]99 hashclr(dpath->sha1);
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]100 memset(&(dpath->parent[0]), 0,
Junio C Hamano4fc970c2007-02-26 06:24:47[diff] [blame]101 sizeof(struct combine_diff_parent)*5);
102
Linus Torvaldsc40641b2008-05-09 16:21:07[diff] [blame]103 changed = check_removed(ce, &st);
Junio C Hamanof58dbf22008-03-31 00:30:08[diff] [blame]104 if (!changed)
105 dpath->mode = ce_mode_from_stat(ce, st.st_mode);
106 else {
107 if (changed < 0) {
Junio C Hamano4fc970c2007-02-26 06:24:47[diff] [blame]108 perror(ce->name);
109 continue;
110 }
111 if (silent_on_removed)
112 continue;
113 }
Junio C Hamanobe3cfa82005-04-26 16:25:05[diff] [blame]114
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]115 while (i < entries) {
116 struct cache_entry *nce = active_cache[i];
117 int stage;
Junio C Hamanobe3cfa82005-04-26 16:25:05[diff] [blame]118
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]119 if (strcmp(ce->name, nce->name))
120 break;
Junio C Hamanobe3cfa82005-04-26 16:25:05[diff] [blame]121
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]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) {
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]127 int mode = nce->ce_mode;
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]128 num_compare_stages++;
Shawn Pearcee7024962006-08-23 06:49:00[diff] [blame]129 hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]130 dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode);
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]131 dpath->parent[stage-2].status =
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]132 DIFF_STATUS_MODIFIED;
133 }
Junio C Hamanocebff982006-03-26 07:12:17[diff] [blame]134
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]135 /* diff against the proper unmerged stage */
136 if (stage == diff_unmerged_stage)
137 ce = nce;
138 i++;
H. Peter Anvin1b1480f2005-11-21 22:17:12[diff] [blame]139 }
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]140 /*
141 * Compensate for loop update
142 */
143 i--;
Junio C Hamano0e3994f2005-06-03 08:37:54[diff] [blame]144
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]145 if (revs->combine_merges && num_compare_stages == 2) {
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]146 show_combined_diff(dpath, 2,
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]147 revs->dense_combined_merges,
148 revs);
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]149 free(dpath);
Junio C Hamano15d061b2005-05-27 22:55:55[diff] [blame]150 continue;
151 }
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]152 free(dpath);
153 dpath = NULL;
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]154
155 /*
156 * Show the diff for the 'ce' if we found the one
157 * from the desired stage.
Junio C Hamano25d5ea42005-05-24 08:10:48[diff] [blame]158 */
Junio C Hamanoe9c84092007-01-05 09:25:18[diff] [blame]159 diff_unmerge(&revs->diffopt, ce->name, 0, null_sha1);
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]160 if (ce_stage(ce) != diff_unmerged_stage)
161 continue;
162 }
163
Junio C Hamano125fd982010-01-24 08:10:20[diff] [blame]164 if (ce_uptodate(ce) || ce_skip_worktree(ce))
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]165 continue;
Junio C Hamanof58dbf22008-03-31 00:30:08[diff] [blame]166
Nguyễn Thái Ngọc Duy540e6942009-08-11 15:43:59[diff] [blame]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);
Junio C Hamanof58dbf22008-03-31 00:30:08[diff] [blame]169 if (changed) {
170 if (changed < 0) {
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]171 perror(ce->name);
172 continue;
Junio C Hamano25d5ea42005-05-24 08:10:48[diff] [blame]173 }
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]174 if (silent_on_removed)
175 continue;
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]176 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]177 ce->sha1, ce->name, 0);
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]178 continue;
Junio C Hamanobceafe72005-05-24 01:14:03[diff] [blame]179 }
Junio C Hamanofb63d7f2007-11-10 02:22:52[diff] [blame]180 changed = ce_match_stat(ce, &st, ce_option);
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]181 if (S_ISGITLINK(ce->ce_mode)
Jens Lehmann4d344772010-01-23 16:37:26[diff] [blame]182 && !DIFF_OPT_TST(&revs->diffopt, IGNORE_SUBMODULES)
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]183 && (!changed || (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
184 && is_submodule_modified(ce->name)) {
185 changed = 1;
186 dirty_submodule = 1;
187 }
Junio C Hamano8fa29602008-03-30 19:39:25[diff] [blame]188 if (!changed) {
189 ce_mark_uptodate(ce);
190 if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
191 continue;
192 }
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]193 oldmode = ce->ce_mode;
194 newmode = ce_mode_from_stat(ce, st.st_mode);
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]195 diff_change(&revs->diffopt, oldmode, newmode,
196 ce->sha1, (changed ? null_sha1 : ce->sha1),
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]197 ce->name, 0, dirty_submodule);
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]198
Junio C Hamanobceafe72005-05-24 01:14:03[diff] [blame]199 }
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]200 diffcore_std(&revs->diffopt);
201 diff_flush(&revs->diffopt);
202 return 0;
Junio C Hamanobceafe72005-05-24 01:14:03[diff] [blame]203}
204
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]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,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]213 const unsigned char *sha1, unsigned int mode,
214 unsigned dirty_submodule)
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]215{
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]216 diff_addremove(&revs->diffopt, prefix[0], mode,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]217 sha1, ce->name, dirty_submodule);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]218}
219
220static int get_stat_data(struct cache_entry *ce,
Junio C Hamanoc8c16f22008-03-02 08:57:26[diff] [blame]221 const unsigned char **sha1p,
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]222 unsigned int *modep,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]223 int cached, int match_missing,
Jens Lehmann4d344772010-01-23 16:37:26[diff] [blame]224 unsigned *dirty_submodule, struct diff_options *diffopt)
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]225{
Junio C Hamanoc8c16f22008-03-02 08:57:26[diff] [blame]226 const unsigned char *sha1 = ce->sha1;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]227 unsigned int mode = ce->ce_mode;
228
Linus Torvalds658dd482009-05-09 21:57:30[diff] [blame]229 if (!cached && !ce_uptodate(ce)) {
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]230 int changed;
231 struct stat st;
Linus Torvaldsc40641b2008-05-09 16:21:07[diff] [blame]232 changed = check_removed(ce, &st);
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]233 if (changed < 0)
234 return -1;
235 else if (changed) {
236 if (match_missing) {
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]237 *sha1p = sha1;
238 *modep = mode;
239 return 0;
240 }
241 return -1;
242 }
243 changed = ce_match_stat(ce, &st, 0);
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]244 if (S_ISGITLINK(ce->ce_mode)
Jens Lehmann4d344772010-01-23 16:37:26[diff] [blame]245 && !DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES)
246 && (!changed || (diffopt->output_format & DIFF_FORMAT_PATCH))
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]247 && is_submodule_modified(ce->name)) {
248 changed = 1;
249 *dirty_submodule = 1;
250 }
251 if (changed) {
Junio C Hamano185c9752007-02-17 06:43:48[diff] [blame]252 mode = ce_mode_from_stat(ce, st.st_mode);
Junio C Hamanoc8c16f22008-03-02 08:57:26[diff] [blame]253 sha1 = null_sha1;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]254 }
255 }
256
257 *sha1p = sha1;
258 *modep = mode;
259 return 0;
260}
261
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]262static void show_new_file(struct rev_info *revs,
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]263 struct cache_entry *new,
264 int cached, int match_missing)
265{
Junio C Hamanoc8c16f22008-03-02 08:57:26[diff] [blame]266 const unsigned char *sha1;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]267 unsigned int mode;
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]268 unsigned dirty_submodule = 0;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]269
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]270 /*
271 * New file in the index: it might actually be different in
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]272 * the working copy.
273 */
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]274 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
Jens Lehmann4d344772010-01-23 16:37:26[diff] [blame]275 &dirty_submodule, &revs->diffopt) < 0)
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]276 return;
277
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]278 diff_index_show_file(revs, "+", new, sha1, mode, dirty_submodule);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]279}
280
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]281static int show_modified(struct rev_info *revs,
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]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;
Junio C Hamanoc8c16f22008-03-02 08:57:26[diff] [blame]288 const unsigned char *sha1;
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]289 unsigned dirty_submodule = 0;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]290
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]291 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
Jens Lehmann4d344772010-01-23 16:37:26[diff] [blame]292 &dirty_submodule, &revs->diffopt) < 0) {
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]293 if (report_missing)
294 diff_index_show_file(revs, "-", old,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]295 old->sha1, old->ce_mode, 0);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]296 return -1;
297 }
298
Paul Mackerrascb2b9f52006-09-04 11:38:40[diff] [blame]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;
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]310 p->mode = mode;
Paul Mackerrascb2b9f52006-09-04 11:38:40[diff] [blame]311 hashclr(p->sha1);
312 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
313 p->parent[0].status = DIFF_STATUS_MODIFIED;
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]314 p->parent[0].mode = new->ce_mode;
Paul Mackerrascb2b9f52006-09-04 11:38:40[diff] [blame]315 hashcpy(p->parent[0].sha1, new->sha1);
316 p->parent[1].status = DIFF_STATUS_MODIFIED;
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]317 p->parent[1].mode = old->ce_mode;
Paul Mackerrascb2b9f52006-09-04 11:38:40[diff] [blame]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
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]324 oldmode = old->ce_mode;
David Rientjesa89fccd2006-08-17 18:54:57[diff] [blame]325 if (mode == oldmode && !hashcmp(sha1, old->sha1) &&
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]326 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]327 return 0;
328
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]329 diff_change(&revs->diffopt, oldmode, mode,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]330 old->sha1, sha1, old->name, 0, dirty_submodule);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]331 return 0;
332}
333
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]334/*
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]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,
Linus Torvalds34110cd2008-03-07 02:12:28[diff] [blame]342 struct cache_entry *tree)
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]343{
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]344 struct rev_info *revs = o->unpack_data;
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]345 int match_missing, cached;
Junio C Hamano5c21ac02006-04-22 10:58:04[diff] [blame]346
Nguyễn Thái Ngọc Duy540e6942009-08-11 15:43:59[diff] [blame]347 /* if the entry is not checked out, don't examine work tree */
Nguyễn Thái Ngọc Duyb4d16902009-08-20 13:46:58[diff] [blame]348 cached = o->index_only ||
349 (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx)));
Junio C Hamanoa6080a02007-06-07 07:04:01[diff] [blame]350 /*
Junio C Hamano5c21ac02006-04-22 10:58:04[diff] [blame]351 * Backward compatibility wart - "diff-index -m" does
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]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".
Junio C Hamano5c21ac02006-04-22 10:58:04[diff] [blame]356 */
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]357 match_missing = !revs->ignore_merges;
358
359 if (cached && idx && ce_stage(idx)) {
Junio C Hamano29796c62009-08-04 23:25:40[diff] [blame]360 diff_unmerge(&revs->diffopt, idx->name, idx->ce_mode,
361 idx->sha1);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]362 return;
363 }
364
365 /*
366 * Something added to the tree?
367 */
368 if (!tree) {
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]369 show_new_file(revs, idx, cached, match_missing);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]370 return;
371 }
372
373 /*
374 * Something removed from the tree?
375 */
376 if (!idx) {
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]377 diff_index_show_file(revs, "-", tree, tree->sha1, tree->ce_mode, 0);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]378 return;
379 }
380
381 /* Show difference between old and new */
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]382 show_modified(revs, tree, idx, 1, cached, match_missing);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]383}
384
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]385/*
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]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 *
Junio C Hamanoda8ba5e2009-09-18 05:12:17[diff] [blame]394 * We're supposed to advance o->pos to skip what we have already processed.
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]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 */
Linus Torvalds34110cd2008-03-07 02:12:28[diff] [blame]400static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o)
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]401{
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]402 struct cache_entry *idx = src[0];
403 struct cache_entry *tree = src[1];
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]404 struct rev_info *revs = o->unpack_data;
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]405
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]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))
Linus Torvalds34110cd2008-03-07 02:12:28[diff] [blame]416 do_oneway_diff(o, idx, tree);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]417
Linus Torvalds34110cd2008-03-07 02:12:28[diff] [blame]418 return 0;
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]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;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]428
Linus Torvalds1f1e8952006-06-20 00:42:35[diff] [blame]429 ent = revs->pending.objects[0].item;
430 tree_name = revs->pending.objects[0].name;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]431 tree = parse_tree_indirect(ent->sha1);
432 if (!tree)
433 return error("bad tree object %s", tree_name);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]434
435 memset(&opts, 0, sizeof(opts));
436 opts.head_idx = 1;
437 opts.index_only = cached;
Junio C Hamanoa0919ce2009-05-23 06:14:25[diff] [blame]438 opts.diff_index_cached = (cached &&
439 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER));
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]440 opts.merge = 1;
441 opts.fn = oneway_diff;
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]442 opts.unpack_data = revs;
Linus Torvalds34110cd2008-03-07 02:12:28[diff] [blame]443 opts.src_index = &the_index;
444 opts.dst_index = NULL;
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]445
446 init_tree_desc(&t, tree->buffer, tree->size);
Daniel Barkalow203a2fe2008-02-07 16:39:48[diff] [blame]447 if (unpack_trees(1, &t, &opts))
448 exit(128);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]449
Junio C Hamanoa5a818e2008-08-19 03:08:09[diff] [blame]450 diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
Junio C Hamano730f7282009-09-20 07:03:39[diff] [blame]451 diffcore_fix_diff_index(&revs->diffopt);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]452 diffcore_std(&revs->diffopt);
453 diff_flush(&revs->diffopt);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]454 return 0;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]455}
Junio C Hamano1cfe7732007-01-30 09:11:08[diff] [blame]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;
Johannes Schindelin204ce972008-01-20 15:19:56[diff] [blame]464 struct unpack_trees_options opts;
465 struct tree_desc t;
Junio C Hamano1cfe7732007-01-30 09:11:08[diff] [blame]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;
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]482 ce->ce_flags |= CE_REMOVE;
Junio C Hamano1cfe7732007-01-30 09:11:08[diff] [blame]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));
Johannes Schindelin204ce972008-01-20 15:19:56[diff] [blame]493
494 memset(&opts, 0, sizeof(opts));
495 opts.head_idx = 1;
496 opts.index_only = 1;
Junio C Hamanoa0919ce2009-05-23 06:14:25[diff] [blame]497 opts.diff_index_cached = !DIFF_OPT_TST(opt, FIND_COPIES_HARDER);
Johannes Schindelin204ce972008-01-20 15:19:56[diff] [blame]498 opts.merge = 1;
499 opts.fn = oneway_diff;
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]500 opts.unpack_data = &revs;
Linus Torvalds34110cd2008-03-07 02:12:28[diff] [blame]501 opts.src_index = &the_index;
502 opts.dst_index = &the_index;
Johannes Schindelin204ce972008-01-20 15:19:56[diff] [blame]503
504 init_tree_desc(&t, tree->buffer, tree->size);
Daniel Barkalow203a2fe2008-02-07 16:39:48[diff] [blame]505 if (unpack_trees(1, &t, &opts))
506 exit(128);
Johannes Schindelin204ce972008-01-20 15:19:56[diff] [blame]507 return 0;
Junio C Hamano1cfe7732007-01-30 09:11:08[diff] [blame]508}
Stephan Beyer75f3ff22009-02-10 14:30:35[diff] [blame]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);
Junio C Hamano90b19942009-05-23 08:15:35[diff] [blame]516 DIFF_OPT_SET(&rev.diffopt, QUICK);
Stephan Beyer75f3ff22009-02-10 14:30:35[diff] [blame]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}