🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.7.6 / . / diff-lib.c
blob: bc49c708c1854a0f67c25e4fd2b77a9ad50ff511 [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"
Nguyễn Thái Ngọc Duy429bb402014-01-24 13:40:28[diff] [blame]14#include "dir.h"
Junio C Hamano427dcb42005-05-21 09:39:09[diff] [blame]15
Junio C Hamanob46f0b62005-05-04 08:45:24[diff] [blame]16/*
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]17 * diff-files
Junio C Hamanob46f0b62005-05-04 08:45:24[diff] [blame]18 */
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]19
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]20/*
Junio C Hamano1392a372008-05-04 00:04:42[diff] [blame]21 * Has the work tree entity been removed?
22 *
23 * Return 1 if it was removed from the work tree, 0 if an entity to be
24 * compared with the cache entry ce still exists (the latter includes
25 * the case where a directory that is not a submodule repository
26 * exists for ce that is a submodule -- it is a submodule that is not
27 * checked out). Return negative for an error.
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]28 */
Linus Torvaldsc40641b2008-05-09 16:21:07[diff] [blame]29static int check_removed(const struct cache_entry *ce, struct stat *st)
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]30{
31 if (lstat(ce->name, st) < 0) {
32 if (errno != ENOENT && errno != ENOTDIR)
33 return -1;
34 return 1;
35 }
Kjetil Barvik57199892009-02-09 20:54:06[diff] [blame]36 if (has_symlink_leading_path(ce->name, ce_namelen(ce)))
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]37 return 1;
38 if (S_ISDIR(st->st_mode)) {
39 unsigned char sub[20];
Junio C Hamano1392a372008-05-04 00:04:42[diff] [blame]40
41 /*
42 * If ce is already a gitlink, we can have a plain
43 * directory (i.e. the submodule is not checked out),
44 * or a checked out submodule. Either case this is not
45 * a case where something was removed from the work tree,
46 * so we will return 0.
47 *
48 * Otherwise, if the directory is not a submodule
49 * repository, that means ce which was a blob turned into
50 * a directory --- the blob was removed!
51 */
52 if (!S_ISGITLINK(ce->ce_mode) &&
53 resolve_gitlink_ref(ce->name, "HEAD", sub))
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]54 return 1;
55 }
56 return 0;
57}
Johannes Schindelind516c2d2007-02-22 20:50:10[diff] [blame]58
Jens Lehmannae6d5c12010-03-11 21:50:25[diff] [blame]59/*
60 * Has a file changed or has a submodule new commits or a dirty work tree?
61 *
62 * Return 1 when changes are detected, 0 otherwise. If the DIRTY_SUBMODULES
63 * option is set, the caller does not only want to know if a submodule is
64 * modified at all but wants to know all the conditions that are met (new
65 * commits, untracked content and/or modified content).
66 */
67static int match_stat_with_submodule(struct diff_options *diffopt,
René Scharfeeb9ae4b2013-06-02 15:46:55[diff] [blame]68 const struct cache_entry *ce,
69 struct stat *st, unsigned ce_option,
70 unsigned *dirty_submodule)
Jens Lehmannae6d5c12010-03-11 21:50:25[diff] [blame]71{
72 int changed = ce_match_stat(ce, st, ce_option);
Jens Lehmannaee9c7d2010-08-05 22:39:25[diff] [blame]73 if (S_ISGITLINK(ce->ce_mode)) {
74 unsigned orig_flags = diffopt->flags;
75 if (!DIFF_OPT_TST(diffopt, OVERRIDE_SUBMODULE_CONFIG))
76 set_diffopt_flags_from_submodule_config(diffopt, ce->name);
77 if (DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES))
78 changed = 0;
79 else if (!DIFF_OPT_TST(diffopt, IGNORE_DIRTY_SUBMODULES)
80 && (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES)))
81 *dirty_submodule = is_submodule_modified(ce->name, DIFF_OPT_TST(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES));
82 diffopt->flags = orig_flags;
Jens Lehmannae6d5c12010-03-11 21:50:25[diff] [blame]83 }
84 return changed;
85}
86
Junio C Hamano4bd5b7d2007-11-10 08:15:03[diff] [blame]87int run_diff_files(struct rev_info *revs, unsigned int option)
Junio C Hamanob46f0b62005-05-04 08:45:24[diff] [blame]88{
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]89 int entries, i;
90 int diff_unmerged_stage = revs->max_count;
Junio C Hamanofb63d7f2007-11-10 02:22:52[diff] [blame]91 unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
92 ? CE_MATCH_RACY_IS_DIRTY : 0);
Junio C Hamano5c975582005-05-19 10:32:35[diff] [blame]93
Junio C Hamanoa5a818e2008-08-19 03:08:09[diff] [blame]94 diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
95
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]96 if (diff_unmerged_stage < 0)
97 diff_unmerged_stage = 2;
Junio C Hamanob4e1e4a2007-02-10 02:51:40[diff] [blame]98 entries = active_nr;
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]99 for (i = 0; i < entries; i++) {
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]100 unsigned int oldmode, newmode;
101 struct cache_entry *ce = active_cache[i];
102 int changed;
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]103 unsigned dirty_submodule = 0;
Junio C Hamano0b86fe82014-12-11 21:11:06[diff] [blame]104 const unsigned char *old_sha1, *new_sha1;
Junio C Hamanof0c6b2a2005-05-27 22:56:38[diff] [blame]105
Junio C Hamano28b92642011-05-31 16:14:17[diff] [blame]106 if (diff_can_quit_early(&revs->diffopt))
Junio C Hamano822cac02007-03-14 18:12:51[diff] [blame]107 break;
108
Nguyễn Thái Ngọc Duy429bb402014-01-24 13:40:28[diff] [blame]109 if (!ce_path_match(ce, &revs->prune_data, NULL))
Linus Torvalds8676eb42006-02-26 23:51:24[diff] [blame]110 continue;
Linus Torvalds8676eb42006-02-26 23:51:24[diff] [blame]111
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]112 if (ce_stage(ce)) {
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]113 struct combine_diff_path *dpath;
Junio C Hamano095ce952011-04-22 23:19:27[diff] [blame]114 struct diff_filepair *pair;
115 unsigned int wt_mode = 0;
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]116 int num_compare_stages = 0;
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]117 size_t path_len;
Jeff King53048102014-05-14 22:13:06[diff] [blame]118 struct stat st;
Linus Torvalds8676eb42006-02-26 23:51:24[diff] [blame]119
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]120 path_len = ce_namelen(ce);
121
Junio C Hamano4fc970c2007-02-26 06:24:47[diff] [blame]122 dpath = xmalloc(combine_diff_path_size(5, path_len));
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]123 dpath->path = (char *) &(dpath->parent[5]);
124
125 dpath->next = NULL;
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]126 memcpy(dpath->path, ce->name, path_len);
127 dpath->path[path_len] = '\0';
brian m. carlson1ff57c12015-03-13 23:39:33[diff] [blame]128 oidclr(&dpath->oid);
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]129 memset(&(dpath->parent[0]), 0,
Junio C Hamano4fc970c2007-02-26 06:24:47[diff] [blame]130 sizeof(struct combine_diff_parent)*5);
131
Linus Torvaldsc40641b2008-05-09 16:21:07[diff] [blame]132 changed = check_removed(ce, &st);
Junio C Hamanof58dbf22008-03-31 00:30:08[diff] [blame]133 if (!changed)
Junio C Hamano095ce952011-04-22 23:19:27[diff] [blame]134 wt_mode = ce_mode_from_stat(ce, st.st_mode);
Junio C Hamanof58dbf22008-03-31 00:30:08[diff] [blame]135 else {
136 if (changed < 0) {
Junio C Hamano4fc970c2007-02-26 06:24:47[diff] [blame]137 perror(ce->name);
138 continue;
139 }
Junio C Hamano095ce952011-04-22 23:19:27[diff] [blame]140 wt_mode = 0;
Junio C Hamano4fc970c2007-02-26 06:24:47[diff] [blame]141 }
Junio C Hamano095ce952011-04-22 23:19:27[diff] [blame]142 dpath->mode = wt_mode;
Junio C Hamanobe3cfa82005-04-26 16:25:05[diff] [blame]143
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]144 while (i < entries) {
145 struct cache_entry *nce = active_cache[i];
146 int stage;
Junio C Hamanobe3cfa82005-04-26 16:25:05[diff] [blame]147
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]148 if (strcmp(ce->name, nce->name))
149 break;
Junio C Hamanobe3cfa82005-04-26 16:25:05[diff] [blame]150
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]151 /* Stage #2 (ours) is the first parent,
152 * stage #3 (theirs) is the second.
153 */
154 stage = ce_stage(nce);
155 if (2 <= stage) {
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]156 int mode = nce->ce_mode;
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]157 num_compare_stages++;
brian m. carlson1ff57c12015-03-13 23:39:33[diff] [blame]158 hashcpy(dpath->parent[stage-2].oid.hash, nce->sha1);
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]159 dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode);
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]160 dpath->parent[stage-2].status =
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]161 DIFF_STATUS_MODIFIED;
162 }
Junio C Hamanocebff982006-03-26 07:12:17[diff] [blame]163
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]164 /* diff against the proper unmerged stage */
165 if (stage == diff_unmerged_stage)
166 ce = nce;
167 i++;
H. Peter Anvin1b1480f2005-11-21 22:17:12[diff] [blame]168 }
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]169 /*
170 * Compensate for loop update
171 */
172 i--;
Junio C Hamano0e3994f2005-06-03 08:37:54[diff] [blame]173
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]174 if (revs->combine_merges && num_compare_stages == 2) {
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]175 show_combined_diff(dpath, 2,
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]176 revs->dense_combined_merges,
177 revs);
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]178 free(dpath);
Junio C Hamano15d061b2005-05-27 22:55:55[diff] [blame]179 continue;
180 }
Florian Forsterb4b15502006-06-18 15:18:05[diff] [blame]181 free(dpath);
182 dpath = NULL;
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]183
184 /*
185 * Show the diff for the 'ce' if we found the one
186 * from the desired stage.
Junio C Hamano25d5ea42005-05-24 08:10:48[diff] [blame]187 */
Junio C Hamano095ce952011-04-22 23:19:27[diff] [blame]188 pair = diff_unmerge(&revs->diffopt, ce->name);
189 if (wt_mode)
190 pair->two->mode = wt_mode;
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]191 if (ce_stage(ce) != diff_unmerged_stage)
192 continue;
193 }
194
Junio C Hamano125fd982010-01-24 08:10:20[diff] [blame]195 if (ce_uptodate(ce) || ce_skip_worktree(ce))
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]196 continue;
Junio C Hamanof58dbf22008-03-31 00:30:08[diff] [blame]197
Nguyễn Thái Ngọc Duy540e6942009-08-11 15:43:59[diff] [blame]198 /* If CE_VALID is set, don't look at workdir for file removal */
Jeff King53048102014-05-14 22:13:06[diff] [blame]199 if (ce->ce_flags & CE_VALID) {
200 changed = 0;
201 newmode = ce->ce_mode;
202 } else {
203 struct stat st;
204
205 changed = check_removed(ce, &st);
206 if (changed) {
207 if (changed < 0) {
208 perror(ce->name);
209 continue;
210 }
211 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
212 ce->sha1, !is_null_sha1(ce->sha1),
213 ce->name, 0);
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]214 continue;
Junio C Hamano25d5ea42005-05-24 08:10:48[diff] [blame]215 }
Jeff King53048102014-05-14 22:13:06[diff] [blame]216
217 changed = match_stat_with_submodule(&revs->diffopt, ce, &st,
218 ce_option, &dirty_submodule);
219 newmode = ce_mode_from_stat(ce, st.st_mode);
Junio C Hamanobceafe72005-05-24 01:14:03[diff] [blame]220 }
Jeff King53048102014-05-14 22:13:06[diff] [blame]221
Jens Lehmann85adbf22010-03-12 21:23:52[diff] [blame]222 if (!changed && !dirty_submodule) {
Junio C Hamano8fa29602008-03-30 19:39:25[diff] [blame]223 ce_mark_uptodate(ce);
224 if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
225 continue;
226 }
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]227 oldmode = ce->ce_mode;
Junio C Hamano0b86fe82014-12-11 21:11:06[diff] [blame]228 old_sha1 = ce->sha1;
229 new_sha1 = changed ? null_sha1 : ce->sha1;
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]230 diff_change(&revs->diffopt, oldmode, newmode,
Junio C Hamano0b86fe82014-12-11 21:11:06[diff] [blame]231 old_sha1, new_sha1,
232 !is_null_sha1(old_sha1),
233 !is_null_sha1(new_sha1),
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]234 ce->name, 0, dirty_submodule);
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]235
Junio C Hamanobceafe72005-05-24 01:14:03[diff] [blame]236 }
Junio C Hamano6973dca2006-04-22 06:57:45[diff] [blame]237 diffcore_std(&revs->diffopt);
238 diff_flush(&revs->diffopt);
239 return 0;
Junio C Hamanobceafe72005-05-24 01:14:03[diff] [blame]240}
241
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]242/*
243 * diff-index
244 */
245
246/* A file entry went away or appeared */
247static void diff_index_show_file(struct rev_info *revs,
248 const char *prefix,
René Scharfeeb9ae4b2013-06-02 15:46:55[diff] [blame]249 const struct cache_entry *ce,
Jeff Kinge5450102012-07-28 15:03:01[diff] [blame]250 const unsigned char *sha1, int sha1_valid,
251 unsigned int mode,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]252 unsigned dirty_submodule)
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]253{
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]254 diff_addremove(&revs->diffopt, prefix[0], mode,
Jeff Kinge5450102012-07-28 15:03:01[diff] [blame]255 sha1, sha1_valid, ce->name, dirty_submodule);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]256}
257
René Scharfeeb9ae4b2013-06-02 15:46:55[diff] [blame]258static int get_stat_data(const struct cache_entry *ce,
Junio C Hamanoc8c16f22008-03-02 08:57:26[diff] [blame]259 const unsigned char **sha1p,
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]260 unsigned int *modep,
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]261 int cached, int match_missing,
Jens Lehmann4d344772010-01-23 16:37:26[diff] [blame]262 unsigned *dirty_submodule, struct diff_options *diffopt)
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]263{
Junio C Hamanoc8c16f22008-03-02 08:57:26[diff] [blame]264 const unsigned char *sha1 = ce->sha1;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]265 unsigned int mode = ce->ce_mode;
266
Linus Torvalds658dd482009-05-09 21:57:30[diff] [blame]267 if (!cached && !ce_uptodate(ce)) {
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]268 int changed;
269 struct stat st;
Linus Torvaldsc40641b2008-05-09 16:21:07[diff] [blame]270 changed = check_removed(ce, &st);
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]271 if (changed < 0)
272 return -1;
273 else if (changed) {
274 if (match_missing) {
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]275 *sha1p = sha1;
276 *modep = mode;
277 return 0;
278 }
279 return -1;
280 }
Jens Lehmannae6d5c12010-03-11 21:50:25[diff] [blame]281 changed = match_stat_with_submodule(diffopt, ce, &st,
282 0, dirty_submodule);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]283 if (changed) {
Junio C Hamano185c9752007-02-17 06:43:48[diff] [blame]284 mode = ce_mode_from_stat(ce, st.st_mode);
Junio C Hamanoc8c16f22008-03-02 08:57:26[diff] [blame]285 sha1 = null_sha1;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]286 }
287 }
288
289 *sha1p = sha1;
290 *modep = mode;
291 return 0;
292}
293
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]294static void show_new_file(struct rev_info *revs,
René Scharfeeb9ae4b2013-06-02 15:46:55[diff] [blame]295 const struct cache_entry *new,
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]296 int cached, int match_missing)
297{
Junio C Hamanoc8c16f22008-03-02 08:57:26[diff] [blame]298 const unsigned char *sha1;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]299 unsigned int mode;
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]300 unsigned dirty_submodule = 0;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]301
Junio C Hamano948dd342008-03-31 00:29:48[diff] [blame]302 /*
303 * New file in the index: it might actually be different in
Carlos Martín Nietof7d650c2011-09-20 20:25:57[diff] [blame]304 * the working tree.
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]305 */
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]306 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
Jens Lehmann4d344772010-01-23 16:37:26[diff] [blame]307 &dirty_submodule, &revs->diffopt) < 0)
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]308 return;
309
Jeff Kinge5450102012-07-28 15:03:01[diff] [blame]310 diff_index_show_file(revs, "+", new, sha1, !is_null_sha1(sha1), mode, dirty_submodule);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]311}
312
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]313static int show_modified(struct rev_info *revs,
René Scharfeeb9ae4b2013-06-02 15:46:55[diff] [blame]314 const struct cache_entry *old,
315 const struct cache_entry *new,
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]316 int report_missing,
317 int cached, int match_missing)
318{
319 unsigned int mode, oldmode;
Junio C Hamanoc8c16f22008-03-02 08:57:26[diff] [blame]320 const unsigned char *sha1;
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]321 unsigned dirty_submodule = 0;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]322
Jens Lehmanne3d42c42010-01-18 20:26:18[diff] [blame]323 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
Jens Lehmann4d344772010-01-23 16:37:26[diff] [blame]324 &dirty_submodule, &revs->diffopt) < 0) {
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]325 if (report_missing)
326 diff_index_show_file(revs, "-", old,
Jeff Kinge5450102012-07-28 15:03:01[diff] [blame]327 old->sha1, 1, old->ce_mode, 0);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]328 return -1;
329 }
330
Paul Mackerrascb2b9f52006-09-04 11:38:40[diff] [blame]331 if (revs->combine_merges && !cached &&
332 (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
333 struct combine_diff_path *p;
334 int pathlen = ce_namelen(new);
335
336 p = xmalloc(combine_diff_path_size(2, pathlen));
337 p->path = (char *) &p->parent[2];
338 p->next = NULL;
Paul Mackerrascb2b9f52006-09-04 11:38:40[diff] [blame]339 memcpy(p->path, new->name, pathlen);
340 p->path[pathlen] = 0;
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]341 p->mode = mode;
brian m. carlson1ff57c12015-03-13 23:39:33[diff] [blame]342 oidclr(&p->oid);
Paul Mackerrascb2b9f52006-09-04 11:38:40[diff] [blame]343 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
344 p->parent[0].status = DIFF_STATUS_MODIFIED;
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]345 p->parent[0].mode = new->ce_mode;
brian m. carlson1ff57c12015-03-13 23:39:33[diff] [blame]346 hashcpy(p->parent[0].oid.hash, new->sha1);
Paul Mackerrascb2b9f52006-09-04 11:38:40[diff] [blame]347 p->parent[1].status = DIFF_STATUS_MODIFIED;
Linus Torvalds7a51ed62008-01-15 00:03:17[diff] [blame]348 p->parent[1].mode = old->ce_mode;
brian m. carlson1ff57c12015-03-13 23:39:33[diff] [blame]349 hashcpy(p->parent[1].oid.hash, old->sha1);
Paul Mackerrascb2b9f52006-09-04 11:38:40[diff] [blame]350 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
351 free(p);
352 return 0;
353 }
354
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]355 oldmode = old->ce_mode;
Jens Lehmann85adbf22010-03-12 21:23:52[diff] [blame]356 if (mode == oldmode && !hashcmp(sha1, old->sha1) && !dirty_submodule &&
Pierre Habouzit8f67f8a2007-11-10 19:05:14[diff] [blame]357 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]358 return 0;
359
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]360 diff_change(&revs->diffopt, oldmode, mode,
Jeff Kinge5450102012-07-28 15:03:01[diff] [blame]361 old->sha1, sha1, 1, !is_null_sha1(sha1),
362 old->name, 0, dirty_submodule);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]363 return 0;
364}
365
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]366/*
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]367 * This gets a mix of an existing index and a tree, one pathname entry
368 * at a time. The index entry may be a single stage-0 one, but it could
369 * also be multiple unmerged entries (in which case idx_pos/idx_nr will
370 * give you the position and number of entries in the index).
371 */
372static void do_oneway_diff(struct unpack_trees_options *o,
René Scharfeeb9ae4b2013-06-02 15:46:55[diff] [blame]373 const struct cache_entry *idx,
374 const struct cache_entry *tree)
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]375{
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]376 struct rev_info *revs = o->unpack_data;
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]377 int match_missing, cached;
Junio C Hamano5c21ac02006-04-22 10:58:04[diff] [blame]378
Nguyễn Thái Ngọc Duy540e6942009-08-11 15:43:59[diff] [blame]379 /* 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]380 cached = o->index_only ||
381 (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx)));
Junio C Hamanoa6080a02007-06-07 07:04:01[diff] [blame]382 /*
Junio C Hamano5c21ac02006-04-22 10:58:04[diff] [blame]383 * Backward compatibility wart - "diff-index -m" does
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]384 * not mean "do not ignore merges", but "match_missing".
385 *
386 * But with the revision flag parsing, that's found in
387 * "!revs->ignore_merges".
Junio C Hamano5c21ac02006-04-22 10:58:04[diff] [blame]388 */
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]389 match_missing = !revs->ignore_merges;
390
391 if (cached && idx && ce_stage(idx)) {
Junio C Hamanofa7b2902011-04-22 23:05:58[diff] [blame]392 struct diff_filepair *pair;
393 pair = diff_unmerge(&revs->diffopt, idx->name);
Junio C Hamanoff00b682011-07-14 04:36:29[diff] [blame]394 if (tree)
Jeff Kinge5450102012-07-28 15:03:01[diff] [blame]395 fill_filespec(pair->one, tree->sha1, 1, tree->ce_mode);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]396 return;
397 }
398
399 /*
400 * Something added to the tree?
401 */
402 if (!tree) {
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]403 show_new_file(revs, idx, cached, match_missing);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]404 return;
405 }
406
407 /*
408 * Something removed from the tree?
409 */
410 if (!idx) {
Jeff Kinge5450102012-07-28 15:03:01[diff] [blame]411 diff_index_show_file(revs, "-", tree, tree->sha1, 1, tree->ce_mode, 0);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]412 return;
413 }
414
415 /* Show difference between old and new */
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]416 show_modified(revs, tree, idx, 1, cached, match_missing);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]417}
418
419/*
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]420 * The unpack_trees() interface is designed for merging, so
421 * the different source entries are designed primarily for
422 * the source trees, with the old index being really mainly
423 * used for being replaced by the result.
424 *
425 * For diffing, the index is more important, and we only have a
426 * single tree.
427 *
Junio C Hamanoda8ba5e2009-09-18 05:12:17[diff] [blame]428 * We're supposed to advance o->pos to skip what we have already processed.
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]429 *
430 * This wrapper makes it all more readable, and takes care of all
431 * the fairly complex unpack_trees() semantic requirements, including
432 * the skipping, the path matching, the type conflict cases etc.
433 */
René Scharfe5828e832013-06-02 15:46:56[diff] [blame]434static int oneway_diff(const struct cache_entry * const *src,
435 struct unpack_trees_options *o)
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]436{
René Scharfeeb9ae4b2013-06-02 15:46:55[diff] [blame]437 const struct cache_entry *idx = src[0];
438 const struct cache_entry *tree = src[1];
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]439 struct rev_info *revs = o->unpack_data;
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]440
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]441 /*
442 * Unpack-trees generates a DF/conflict entry if
443 * there was a directory in the index and a tree
444 * in the tree. From a diff standpoint, that's a
445 * delete of the tree and a create of the file.
446 */
447 if (tree == o->df_conflict_entry)
448 tree = NULL;
449
Nguyễn Thái Ngọc Duy429bb402014-01-24 13:40:28[diff] [blame]450 if (ce_path_match(idx ? idx : tree, &revs->prune_data, NULL)) {
Linus Torvalds34110cd2008-03-07 02:12:28[diff] [blame]451 do_oneway_diff(o, idx, tree);
Junio C Hamanob4194822011-05-31 17:06:44[diff] [blame]452 if (diff_can_quit_early(&revs->diffopt)) {
453 o->exiting_early = 1;
454 return -1;
455 }
456 }
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]457
Linus Torvalds34110cd2008-03-07 02:12:28[diff] [blame]458 return 0;
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]459}
460
Junio C Hamanobf979c02011-07-14 01:57:42[diff] [blame]461static int diff_cache(struct rev_info *revs,
462 const unsigned char *tree_sha1,
463 const char *tree_name,
464 int cached)
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]465{
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]466 struct tree *tree;
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]467 struct tree_desc t;
Junio C Hamanobf979c02011-07-14 01:57:42[diff] [blame]468 struct unpack_trees_options opts;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]469
Junio C Hamanobf979c02011-07-14 01:57:42[diff] [blame]470 tree = parse_tree_indirect(tree_sha1);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]471 if (!tree)
Junio C Hamanobf979c02011-07-14 01:57:42[diff] [blame]472 return error("bad tree object %s",
473 tree_name ? tree_name : sha1_to_hex(tree_sha1));
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]474 memset(&opts, 0, sizeof(opts));
475 opts.head_idx = 1;
476 opts.index_only = cached;
Junio C Hamanoa0919ce2009-05-23 06:14:25[diff] [blame]477 opts.diff_index_cached = (cached &&
478 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER));
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]479 opts.merge = 1;
480 opts.fn = oneway_diff;
Kjetil Barvikff7e6aa2009-01-11 18:36:42[diff] [blame]481 opts.unpack_data = revs;
Linus Torvalds34110cd2008-03-07 02:12:28[diff] [blame]482 opts.src_index = &the_index;
483 opts.dst_index = NULL;
Junio C Hamano2f88c192011-08-29 20:34:08[diff] [blame]484 opts.pathspec = &revs->diffopt.pathspec;
Nguyen Thai Ngoc Duy48382372012-01-15 10:03:27[diff] [blame]485 opts.pathspec->recursive = 1;
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]486
487 init_tree_desc(&t, tree->buffer, tree->size);
Junio C Hamanobf979c02011-07-14 01:57:42[diff] [blame]488 return unpack_trees(1, &t, &opts);
489}
490
491int run_diff_index(struct rev_info *revs, int cached)
492{
493 struct object_array_entry *ent;
494
495 ent = revs->pending.objects;
brian m. carlsoned1c9972015-11-10 02:22:29[diff] [blame]496 if (diff_cache(revs, ent->item->oid.hash, ent->name, cached))
Daniel Barkalow203a2fe2008-02-07 16:39:48[diff] [blame]497 exit(128);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]498
Junio C Hamanoa5a818e2008-08-19 03:08:09[diff] [blame]499 diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
Junio C Hamano730f7282009-09-20 07:03:39[diff] [blame]500 diffcore_fix_diff_index(&revs->diffopt);
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]501 diffcore_std(&revs->diffopt);
502 diff_flush(&revs->diffopt);
Linus Torvaldsd1f2d7e2008-01-20 01:27:12[diff] [blame]503 return 0;
Junio C Hamanoe09ad6e2006-04-22 09:43:00[diff] [blame]504}
Junio C Hamano1cfe7732007-01-30 09:11:08[diff] [blame]505
506int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
507{
Junio C Hamano1cfe7732007-01-30 09:11:08[diff] [blame]508 struct rev_info revs;
Junio C Hamano1cfe7732007-01-30 09:11:08[diff] [blame]509
510 init_revisions(&revs, NULL);
Nguyễn Thái Ngọc Duy9a087272013-07-14 08:35:59[diff] [blame]511 copy_pathspec(&revs.prune_data, &opt->pathspec);
Junio C Hamanobf979c02011-07-14 01:57:42[diff] [blame]512 revs.diffopt = *opt;
Johannes Schindelin204ce972008-01-20 15:19:56[diff] [blame]513
Junio C Hamanobf979c02011-07-14 01:57:42[diff] [blame]514 if (diff_cache(&revs, tree_sha1, NULL, 1))
Daniel Barkalow203a2fe2008-02-07 16:39:48[diff] [blame]515 exit(128);
Johannes Schindelin204ce972008-01-20 15:19:56[diff] [blame]516 return 0;
Junio C Hamano1cfe7732007-01-30 09:11:08[diff] [blame]517}
Stephan Beyer75f3ff22009-02-10 14:30:35[diff] [blame]518
519int index_differs_from(const char *def, int diff_flags)
520{
521 struct rev_info rev;
Junio C Hamano32962c92010-03-09 06:58:09[diff] [blame]522 struct setup_revision_opt opt;
Stephan Beyer75f3ff22009-02-10 14:30:35[diff] [blame]523
524 init_revisions(&rev, NULL);
Junio C Hamano32962c92010-03-09 06:58:09[diff] [blame]525 memset(&opt, 0, sizeof(opt));
526 opt.def = def;
527 setup_revisions(0, NULL, &rev, &opt);
Junio C Hamano90b19942009-05-23 08:15:35[diff] [blame]528 DIFF_OPT_SET(&rev.diffopt, QUICK);
Stephan Beyer75f3ff22009-02-10 14:30:35[diff] [blame]529 DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
530 rev.diffopt.flags |= diff_flags;
531 run_diff_index(&rev, 1);
532 if (rev.pending.alloc)
533 free(rev.pending.objects);
534 return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0);
535}