Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 528 lines (469 sloc) 14.299 kb
be3cfa8 [PATCH] Diff-tree-helper take two.
Junio C Hamano authored
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
86436c2 [PATCH] Split external diff command interface to a separate file.
Junio C Hamano authored
4 #include "cache.h"
6fb737b [PATCH] Make sq_expand() available as sq_quote().
Junio C Hamano authored
5 #include "quote.h"
6973dca Libify diff-files.
Junio C Hamano authored
6 #include "commit.h"
86436c2 [PATCH] Split external diff command interface to a separate file.
Junio C Hamano authored
7 #include "diff.h"
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
8 #include "diffcore.h"
6973dca Libify diff-files.
Junio C Hamano authored
9 #include "revision.h"
1cfe773 git-blame: no rev means start from the working tree file.
Junio C Hamano authored
10 #include "cache-tree.h"
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
11 #include "unpack-trees.h"
948dd34 @gitster diff-index: careful when inspecting work tree items
gitster authored
12 #include "refs.h"
ee6fc51 @jlehmann Show submodules as modified when they contain a dirty work tree
jlehmann authored
13 #include "submodule.h"
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
14
b46f0b6 Optimize diff-cache -p --cached
Junio C Hamano authored
15 /*
6973dca Libify diff-files.
Junio C Hamano authored
16 * diff-files
b46f0b6 Optimize diff-cache -p --cached
Junio C Hamano authored
17 */
f0c6b2a [PATCH] Optimize diff-tree -[CM] --stdin
Junio C Hamano authored
18
948dd34 @gitster diff-index: careful when inspecting work tree items
gitster authored
19 /*
1392a37 @gitster diff: a submodule not checked out is not modified
gitster authored
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.
948dd34 @gitster diff-index: careful when inspecting work tree items
gitster authored
27 */
c40641b @torvalds Optimize symlink/directory detection
torvalds authored
28 static int check_removed(const struct cache_entry *ce, struct stat *st)
948dd34 @gitster diff-index: careful when inspecting work tree items
gitster authored
29 {
30 if (lstat(ce->name, st) < 0) {
31 if (errno != ENOENT && errno != ENOTDIR)
32 return -1;
33 return 1;
34 }
5719989 lstat_cache(): swap func(length, string) into func(string, length)
Kjetil Barvik authored
35 if (has_symlink_leading_path(ce->name, ce_namelen(ce)))
948dd34 @gitster diff-index: careful when inspecting work tree items
gitster authored
36 return 1;
37 if (S_ISDIR(st->st_mode)) {
38 unsigned char sub[20];
1392a37 @gitster diff: a submodule not checked out is not modified
gitster authored
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))
948dd34 @gitster diff-index: careful when inspecting work tree items
gitster authored
53 return 1;
54 }
55 return 0;
56 }
d516c2d @dscho Teach git-diff-files the new option `--no-index`
dscho authored
57
ae6d5c1 @jlehmann Refactor dirty submodule detection in diff-lib.c
jlehmann authored
58 /*
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 */
66 static 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);
aee9c7d @jlehmann Submodules: Add the new "ignore" config option for diff and status
jlehmann authored
71 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;
ae6d5c1 @jlehmann Refactor dirty submodule detection in diff-lib.c
jlehmann authored
81 }
82 return changed;
83 }
84
4bd5b7d @gitster ce_match_stat, run_diff_files: use symbolic constants for readability
gitster authored
85 int run_diff_files(struct rev_info *revs, unsigned int option)
f0c6b2a [PATCH] Optimize diff-tree -[CM] --stdin
Junio C Hamano authored
86 {
6973dca Libify diff-files.
Junio C Hamano authored
87 int entries, i;
88 int diff_unmerged_stage = revs->max_count;
4bd5b7d @gitster ce_match_stat, run_diff_files: use symbolic constants for readability
gitster authored
89 int silent_on_removed = option & DIFF_SILENT_ON_REMOVED;
fb63d7f @gitster git-add: make the entry stat-clean after re-adding the same contents
gitster authored
90 unsigned ce_option = ((option & DIFF_RACY_IS_MODIFIED)
91 ? CE_MATCH_RACY_IS_DIRTY : 0);
f0c6b2a [PATCH] Optimize diff-tree -[CM] --stdin
Junio C Hamano authored
92
a5a818e @gitster diff: vary default prefix depending on what are compared
gitster authored
93 diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
94
6973dca Libify diff-files.
Junio C Hamano authored
95 if (diff_unmerged_stage < 0)
96 diff_unmerged_stage = 2;
b4e1e4a run_diff_{files,index}(): update calling convention.
Junio C Hamano authored
97 entries = active_nr;
6973dca Libify diff-files.
Junio C Hamano authored
98 for (i = 0; i < entries; i++) {
be3cfa8 [PATCH] Diff-tree-helper take two.
Junio C Hamano authored
99 struct stat st;
6973dca Libify diff-files.
Junio C Hamano authored
100 unsigned int oldmode, newmode;
101 struct cache_entry *ce = active_cache[i];
102 int changed;
e3d42c4 @jlehmann Performance optimization for detection of modified submodules
jlehmann authored
103 unsigned dirty_submodule = 0;
8676eb4 Make git diff-generation use a simpler spawn-like interface
Linus Torvalds authored
104
28b9264 @gitster diff: futureproof "stop feeding the backend early" logic
gitster authored
105 if (diff_can_quit_early(&revs->diffopt))
822cac0 Teach --quiet to diff backends.
Junio C Hamano authored
106 break;
107
eb9cb55 @pclouds Convert ce_path_match() to use struct pathspec
pclouds authored
108 if (!ce_path_match(ce, &revs->prune_data))
8676eb4 Make git diff-generation use a simpler spawn-like interface
Linus Torvalds authored
109 continue;
be3cfa8 [PATCH] Diff-tree-helper take two.
Junio C Hamano authored
110
6973dca Libify diff-files.
Junio C Hamano authored
111 if (ce_stage(ce)) {
b4b1550 Don't instantiate structures with FAMs.
Florian Forster authored
112 struct combine_diff_path *dpath;
095ce95 @gitster diff-files: show unmerged entries correctly
gitster authored
113 struct diff_filepair *pair;
114 unsigned int wt_mode = 0;
6973dca Libify diff-files.
Junio C Hamano authored
115 int num_compare_stages = 0;
b4b1550 Don't instantiate structures with FAMs.
Florian Forster authored
116 size_t path_len;
6973dca Libify diff-files.
Junio C Hamano authored
117
b4b1550 Don't instantiate structures with FAMs.
Florian Forster authored
118 path_len = ce_namelen(ce);
119
4fc970c diff --cc: fix display of symlink conflicts during a merge.
Junio C Hamano authored
120 dpath = xmalloc(combine_diff_path_size(5, path_len));
b4b1550 Don't instantiate structures with FAMs.
Florian Forster authored
121 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';
a8e0d16 Convert memset(hash,0,20) to hashclr(hash).
Junio C Hamano authored
127 hashclr(dpath->sha1);
b4b1550 Don't instantiate structures with FAMs.
Florian Forster authored
128 memset(&(dpath->parent[0]), 0,
4fc970c diff --cc: fix display of symlink conflicts during a merge.
Junio C Hamano authored
129 sizeof(struct combine_diff_parent)*5);
130
c40641b @torvalds Optimize symlink/directory detection
torvalds authored
131 changed = check_removed(ce, &st);
f58dbf2 @gitster diff-files: careful when inspecting work tree items
gitster authored
132 if (!changed)
095ce95 @gitster diff-files: show unmerged entries correctly
gitster authored
133 wt_mode = ce_mode_from_stat(ce, st.st_mode);
f58dbf2 @gitster diff-files: careful when inspecting work tree items
gitster authored
134 else {
135 if (changed < 0) {
4fc970c diff --cc: fix display of symlink conflicts during a merge.
Junio C Hamano authored
136 perror(ce->name);
137 continue;
138 }
139 if (silent_on_removed)
140 continue;
095ce95 @gitster diff-files: show unmerged entries correctly
gitster authored
141 wt_mode = 0;
4fc970c diff --cc: fix display of symlink conflicts during a merge.
Junio C Hamano authored
142 }
095ce95 @gitster diff-files: show unmerged entries correctly
gitster authored
143 dpath->mode = wt_mode;
6973dca Libify diff-files.
Junio C Hamano authored
144
145 while (i < entries) {
146 struct cache_entry *nce = active_cache[i];
147 int stage;
148
149 if (strcmp(ce->name, nce->name))
150 break;
151
152 /* Stage #2 (ours) is the first parent,
153 * stage #3 (theirs) is the second.
154 */
155 stage = ce_stage(nce);
156 if (2 <= stage) {
7a51ed6 @torvalds Make on-disk index representation separate from in-core one
torvalds authored
157 int mode = nce->ce_mode;
6973dca Libify diff-files.
Junio C Hamano authored
158 num_compare_stages++;
e702496 @spearce Convert memcpy(a,b,20) to hashcpy(a,b).
spearce authored
159 hashcpy(dpath->parent[stage-2].sha1, nce->sha1);
7a51ed6 @torvalds Make on-disk index representation separate from in-core one
torvalds authored
160 dpath->parent[stage-2].mode = ce_mode_from_stat(nce, mode);
b4b1550 Don't instantiate structures with FAMs.
Florian Forster authored
161 dpath->parent[stage-2].status =
6973dca Libify diff-files.
Junio C Hamano authored
162 DIFF_STATUS_MODIFIED;
163 }
164
165 /* diff against the proper unmerged stage */
166 if (stage == diff_unmerged_stage)
167 ce = nce;
168 i++;
169 }
170 /*
171 * Compensate for loop update
f0c6b2a [PATCH] Optimize diff-tree -[CM] --stdin
Junio C Hamano authored
172 */
6973dca Libify diff-files.
Junio C Hamano authored
173 i--;
6b5ee13 Diff clean-up.
Junio C Hamano authored
174
6973dca Libify diff-files.
Junio C Hamano authored
175 if (revs->combine_merges && num_compare_stages == 2) {
b4b1550 Don't instantiate structures with FAMs.
Florian Forster authored
176 show_combined_diff(dpath, 2,
6973dca Libify diff-files.
Junio C Hamano authored
177 revs->dense_combined_merges,
178 revs);
b4b1550 Don't instantiate structures with FAMs.
Florian Forster authored
179 free(dpath);
6973dca Libify diff-files.
Junio C Hamano authored
180 continue;
1b1480f rename/copy score parsing updates.
H. Peter Anvin authored
181 }
b4b1550 Don't instantiate structures with FAMs.
Florian Forster authored
182 free(dpath);
183 dpath = NULL;
0e3994f [PATCH] diff: Clean up diff_scoreopt_parse().
Junio C Hamano authored
184
6973dca Libify diff-files.
Junio C Hamano authored
185 /*
186 * Show the diff for the 'ce' if we found the one
187 * from the desired stage.
188 */
095ce95 @gitster diff-files: show unmerged entries correctly
gitster authored
189 pair = diff_unmerge(&revs->diffopt, ce->name);
190 if (wt_mode)
191 pair->two->mode = wt_mode;
6973dca Libify diff-files.
Junio C Hamano authored
192 if (ce_stage(ce) != diff_unmerged_stage)
193 continue;
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
194 }
6b14d7f [PATCH] Diffcore updates.
Junio C Hamano authored
195
125fd98 @gitster Make ce_uptodate() trustworthy again
gitster authored
196 if (ce_uptodate(ce) || ce_skip_worktree(ce))
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
197 continue;
f58dbf2 @gitster diff-files: careful when inspecting work tree items
gitster authored
198
540e694 @pclouds Prevent diff machinery from examining assume-unchanged entries on worktr...
pclouds authored
199 /* 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);
f58dbf2 @gitster diff-files: careful when inspecting work tree items
gitster authored
201 if (changed) {
202 if (changed < 0) {
6973dca Libify diff-files.
Junio C Hamano authored
203 perror(ce->name);
15d061b [PATCH] Fix the way diffcore-rename records unremoved source.
Junio C Hamano authored
204 continue;
205 }
6973dca Libify diff-files.
Junio C Hamano authored
206 if (silent_on_removed)
207 continue;
7a51ed6 @torvalds Make on-disk index representation separate from in-core one
torvalds authored
208 diff_addremove(&revs->diffopt, '-', ce->ce_mode,
e545010 @peff diff: do not use null sha1 as a sentinel value
peff authored
209 ce->sha1, !is_null_sha1(ce->sha1),
210 ce->name, 0);
6973dca Libify diff-files.
Junio C Hamano authored
211 continue;
f2ce9fd [PATCH] Add --diff-filter= output restriction to diff-* family.
Junio C Hamano authored
212 }
ae6d5c1 @jlehmann Refactor dirty submodule detection in diff-lib.c
jlehmann authored
213 changed = match_stat_with_submodule(&revs->diffopt, ce, &st,
214 ce_option, &dirty_submodule);
85adbf2 @jlehmann git status: Fix false positive "new commits" output for dirty submodules
jlehmann authored
215 if (!changed && !dirty_submodule) {
8fa2960 @gitster diff-files: mark an index entry we know is up-to-date as such
gitster authored
216 ce_mark_uptodate(ce);
217 if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
218 continue;
219 }
7a51ed6 @torvalds Make on-disk index representation separate from in-core one
torvalds authored
220 oldmode = ce->ce_mode;
221 newmode = ce_mode_from_stat(ce, st.st_mode);
6973dca Libify diff-files.
Junio C Hamano authored
222 diff_change(&revs->diffopt, oldmode, newmode,
223 ce->sha1, (changed ? null_sha1 : ce->sha1),
e545010 @peff diff: do not use null sha1 as a sentinel value
peff authored
224 !is_null_sha1(ce->sha1), (changed ? 0 : !is_null_sha1(ce->sha1)),
e3d42c4 @jlehmann Performance optimization for detection of modified submodules
jlehmann authored
225 ce->name, 0, dirty_submodule);
77eb272 [PATCH] Reworked external diff interface.
Junio C Hamano authored
226
7ca4525 [PATCH] Simplify "reverse-diff" logic in the diff core.
Junio C Hamano authored
227 }
6973dca Libify diff-files.
Junio C Hamano authored
228 diffcore_std(&revs->diffopt);
229 diff_flush(&revs->diffopt);
230 return 0;
77eb272 [PATCH] Reworked external diff interface.
Junio C Hamano authored
231 }
be3cfa8 [PATCH] Diff-tree-helper take two.
Junio C Hamano authored
232
e09ad6e Libify diff-index.
Junio C Hamano authored
233 /*
234 * diff-index
235 */
236
237 /* A file entry went away or appeared */
238 static void diff_index_show_file(struct rev_info *revs,
239 const char *prefix,
240 struct cache_entry *ce,
e545010 @peff diff: do not use null sha1 as a sentinel value
peff authored
241 const unsigned char *sha1, int sha1_valid,
242 unsigned int mode,
e3d42c4 @jlehmann Performance optimization for detection of modified submodules
jlehmann authored
243 unsigned dirty_submodule)
e09ad6e Libify diff-index.
Junio C Hamano authored
244 {
7a51ed6 @torvalds Make on-disk index representation separate from in-core one
torvalds authored
245 diff_addremove(&revs->diffopt, prefix[0], mode,
e545010 @peff diff: do not use null sha1 as a sentinel value
peff authored
246 sha1, sha1_valid, ce->name, dirty_submodule);
e09ad6e Libify diff-index.
Junio C Hamano authored
247 }
248
249 static int get_stat_data(struct cache_entry *ce,
c8c16f2 @gitster diff-lib.c: constness strengthening
gitster authored
250 const unsigned char **sha1p,
e09ad6e Libify diff-index.
Junio C Hamano authored
251 unsigned int *modep,
e3d42c4 @jlehmann Performance optimization for detection of modified submodules
jlehmann authored
252 int cached, int match_missing,
4d34477 @jlehmann git diff: Don't test submodule dirtiness with --ignore-submodules
jlehmann authored
253 unsigned *dirty_submodule, struct diff_options *diffopt)
e09ad6e Libify diff-index.
Junio C Hamano authored
254 {
c8c16f2 @gitster diff-lib.c: constness strengthening
gitster authored
255 const unsigned char *sha1 = ce->sha1;
e09ad6e Libify diff-index.
Junio C Hamano authored
256 unsigned int mode = ce->ce_mode;
257
658dd48 @torvalds Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
torvalds authored
258 if (!cached && !ce_uptodate(ce)) {
e09ad6e Libify diff-index.
Junio C Hamano authored
259 int changed;
260 struct stat st;
c40641b @torvalds Optimize symlink/directory detection
torvalds authored
261 changed = check_removed(ce, &st);
948dd34 @gitster diff-index: careful when inspecting work tree items
gitster authored
262 if (changed < 0)
263 return -1;
264 else if (changed) {
265 if (match_missing) {
e09ad6e Libify diff-index.
Junio C Hamano authored
266 *sha1p = sha1;
267 *modep = mode;
268 return 0;
269 }
270 return -1;
271 }
ae6d5c1 @jlehmann Refactor dirty submodule detection in diff-lib.c
jlehmann authored
272 changed = match_stat_with_submodule(diffopt, ce, &st,
273 0, dirty_submodule);
e09ad6e Libify diff-index.
Junio C Hamano authored
274 if (changed) {
185c975 Do not take mode bits from index after type change.
Junio C Hamano authored
275 mode = ce_mode_from_stat(ce, st.st_mode);
c8c16f2 @gitster diff-lib.c: constness strengthening
gitster authored
276 sha1 = null_sha1;
e09ad6e Libify diff-index.
Junio C Hamano authored
277 }
278 }
279
280 *sha1p = sha1;
281 *modep = mode;
282 return 0;
283 }
284
ff7e6aa Cleanup of unused symcache variable inside diff-lib.c
Kjetil Barvik authored
285 static void show_new_file(struct rev_info *revs,
e09ad6e Libify diff-index.
Junio C Hamano authored
286 struct cache_entry *new,
287 int cached, int match_missing)
288 {
c8c16f2 @gitster diff-lib.c: constness strengthening
gitster authored
289 const unsigned char *sha1;
e09ad6e Libify diff-index.
Junio C Hamano authored
290 unsigned int mode;
e3d42c4 @jlehmann Performance optimization for detection of modified submodules
jlehmann authored
291 unsigned dirty_submodule = 0;
e09ad6e Libify diff-index.
Junio C Hamano authored
292
948dd34 @gitster diff-index: careful when inspecting work tree items
gitster authored
293 /*
294 * New file in the index: it might actually be different in
f7d650c @carlosmn Remove 'working copy' from the documentation and C code
carlosmn authored
295 * the working tree.
e09ad6e Libify diff-index.
Junio C Hamano authored
296 */
e3d42c4 @jlehmann Performance optimization for detection of modified submodules
jlehmann authored
297 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
4d34477 @jlehmann git diff: Don't test submodule dirtiness with --ignore-submodules
jlehmann authored
298 &dirty_submodule, &revs->diffopt) < 0)
e09ad6e Libify diff-index.
Junio C Hamano authored
299 return;
300
e545010 @peff diff: do not use null sha1 as a sentinel value
peff authored
301 diff_index_show_file(revs, "+", new, sha1, !is_null_sha1(sha1), mode, dirty_submodule);
e09ad6e Libify diff-index.
Junio C Hamano authored
302 }
303
ff7e6aa Cleanup of unused symcache variable inside diff-lib.c
Kjetil Barvik authored
304 static int show_modified(struct rev_info *revs,
e09ad6e Libify diff-index.
Junio C Hamano authored
305 struct cache_entry *old,
306 struct cache_entry *new,
307 int report_missing,
308 int cached, int match_missing)
309 {
310 unsigned int mode, oldmode;
c8c16f2 @gitster diff-lib.c: constness strengthening
gitster authored
311 const unsigned char *sha1;
e3d42c4 @jlehmann Performance optimization for detection of modified submodules
jlehmann authored
312 unsigned dirty_submodule = 0;
e09ad6e Libify diff-index.
Junio C Hamano authored
313
e3d42c4 @jlehmann Performance optimization for detection of modified submodules
jlehmann authored
314 if (get_stat_data(new, &sha1, &mode, cached, match_missing,
4d34477 @jlehmann git diff: Don't test submodule dirtiness with --ignore-submodules
jlehmann authored
315 &dirty_submodule, &revs->diffopt) < 0) {
e09ad6e Libify diff-index.
Junio C Hamano authored
316 if (report_missing)
317 diff_index_show_file(revs, "-", old,
e545010 @peff diff: do not use null sha1 as a sentinel value
peff authored
318 old->sha1, 1, old->ce_mode, 0);
e09ad6e Libify diff-index.
Junio C Hamano authored
319 return -1;
320 }
321
cb2b9f5 @paulusmack diff-index --cc shows a 3-way diff between HEAD, index and working tree.
paulusmack authored
322 if (revs->combine_merges && !cached &&
323 (hashcmp(sha1, old->sha1) || hashcmp(old->sha1, new->sha1))) {
324 struct combine_diff_path *p;
325 int pathlen = ce_namelen(new);
326
327 p = xmalloc(combine_diff_path_size(2, pathlen));
328 p->path = (char *) &p->parent[2];
329 p->next = NULL;
330 p->len = pathlen;
331 memcpy(p->path, new->name, pathlen);
332 p->path[pathlen] = 0;
7a51ed6 @torvalds Make on-disk index representation separate from in-core one
torvalds authored
333 p->mode = mode;
cb2b9f5 @paulusmack diff-index --cc shows a 3-way diff between HEAD, index and working tree.
paulusmack authored
334 hashclr(p->sha1);
335 memset(p->parent, 0, 2 * sizeof(struct combine_diff_parent));
336 p->parent[0].status = DIFF_STATUS_MODIFIED;
7a51ed6 @torvalds Make on-disk index representation separate from in-core one
torvalds authored
337 p->parent[0].mode = new->ce_mode;
cb2b9f5 @paulusmack diff-index --cc shows a 3-way diff between HEAD, index and working tree.
paulusmack authored
338 hashcpy(p->parent[0].sha1, new->sha1);
339 p->parent[1].status = DIFF_STATUS_MODIFIED;
7a51ed6 @torvalds Make on-disk index representation separate from in-core one
torvalds authored
340 p->parent[1].mode = old->ce_mode;
cb2b9f5 @paulusmack diff-index --cc shows a 3-way diff between HEAD, index and working tree.
paulusmack authored
341 hashcpy(p->parent[1].sha1, old->sha1);
342 show_combined_diff(p, 2, revs->dense_combined_merges, revs);
343 free(p);
344 return 0;
345 }
346
e09ad6e Libify diff-index.
Junio C Hamano authored
347 oldmode = old->ce_mode;
85adbf2 @jlehmann git status: Fix false positive "new commits" output for dirty submodules
jlehmann authored
348 if (mode == oldmode && !hashcmp(sha1, old->sha1) && !dirty_submodule &&
8f67f8a @MadCoder Make the diff_options bitfields be an unsigned with explicit masks.
MadCoder authored
349 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
e09ad6e Libify diff-index.
Junio C Hamano authored
350 return 0;
351
352 diff_change(&revs->diffopt, oldmode, mode,
e545010 @peff diff: do not use null sha1 as a sentinel value
peff authored
353 old->sha1, sha1, 1, !is_null_sha1(sha1),
354 old->name, 0, dirty_submodule);
e09ad6e Libify diff-index.
Junio C Hamano authored
355 return 0;
356 }
357
358 /*
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
359 * This gets a mix of an existing index and a tree, one pathname entry
360 * at a time. The index entry may be a single stage-0 one, but it could
361 * also be multiple unmerged entries (in which case idx_pos/idx_nr will
362 * give you the position and number of entries in the index).
363 */
364 static void do_oneway_diff(struct unpack_trees_options *o,
365 struct cache_entry *idx,
34110cd @torvalds Make 'unpack_trees()' have a separate source and destination index
torvalds authored
366 struct cache_entry *tree)
e09ad6e Libify diff-index.
Junio C Hamano authored
367 {
ff7e6aa Cleanup of unused symcache variable inside diff-lib.c
Kjetil Barvik authored
368 struct rev_info *revs = o->unpack_data;
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
369 int match_missing, cached;
5c21ac0 Libified diff-index: backward compatibility fix.
Junio C Hamano authored
370
540e694 @pclouds Prevent diff machinery from examining assume-unchanged entries on worktr...
pclouds authored
371 /* if the entry is not checked out, don't examine work tree */
b4d1690 @pclouds Teach Git to respect skip-worktree bit (reading part)
pclouds authored
372 cached = o->index_only ||
373 (idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx)));
a6080a0 @gitster War on whitespace
gitster authored
374 /*
5c21ac0 Libified diff-index: backward compatibility fix.
Junio C Hamano authored
375 * Backward compatibility wart - "diff-index -m" does
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
376 * not mean "do not ignore merges", but "match_missing".
377 *
378 * But with the revision flag parsing, that's found in
379 * "!revs->ignore_merges".
380 */
381 match_missing = !revs->ignore_merges;
382
383 if (cached && idx && ce_stage(idx)) {
fa7b290 @gitster diff: remove often unused parameters from diff_unmerge()
gitster authored
384 struct diff_filepair *pair;
385 pair = diff_unmerge(&revs->diffopt, idx->name);
ff00b68 @gitster reset [<commit>] paths...: do not mishandle unmerged paths
gitster authored
386 if (tree)
e545010 @peff diff: do not use null sha1 as a sentinel value
peff authored
387 fill_filespec(pair->one, tree->sha1, 1, tree->ce_mode);
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
388 return;
389 }
390
391 /*
392 * Something added to the tree?
393 */
394 if (!tree) {
ff7e6aa Cleanup of unused symcache variable inside diff-lib.c
Kjetil Barvik authored
395 show_new_file(revs, idx, cached, match_missing);
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
396 return;
397 }
398
399 /*
400 * Something removed from the tree?
5c21ac0 Libified diff-index: backward compatibility fix.
Junio C Hamano authored
401 */
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
402 if (!idx) {
e545010 @peff diff: do not use null sha1 as a sentinel value
peff authored
403 diff_index_show_file(revs, "-", tree, tree->sha1, 1, tree->ce_mode, 0);
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
404 return;
405 }
406
407 /* Show difference between old and new */
ff7e6aa Cleanup of unused symcache variable inside diff-lib.c
Kjetil Barvik authored
408 show_modified(revs, tree, idx, 1, cached, match_missing);
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
409 }
410
411 /*
412 * The unpack_trees() interface is designed for merging, so
413 * the different source entries are designed primarily for
414 * the source trees, with the old index being really mainly
415 * used for being replaced by the result.
416 *
417 * For diffing, the index is more important, and we only have a
418 * single tree.
419 *
da8ba5e @gitster diff-lib.c: fix misleading comments on oneway_diff()
gitster authored
420 * We're supposed to advance o->pos to skip what we have already processed.
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
421 *
422 * This wrapper makes it all more readable, and takes care of all
423 * the fairly complex unpack_trees() semantic requirements, including
424 * the skipping, the path matching, the type conflict cases etc.
425 */
34110cd @torvalds Make 'unpack_trees()' have a separate source and destination index
torvalds authored
426 static int oneway_diff(struct cache_entry **src, struct unpack_trees_options *o)
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
427 {
428 struct cache_entry *idx = src[0];
429 struct cache_entry *tree = src[1];
ff7e6aa Cleanup of unused symcache variable inside diff-lib.c
Kjetil Barvik authored
430 struct rev_info *revs = o->unpack_data;
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
431
432 /*
433 * Unpack-trees generates a DF/conflict entry if
434 * there was a directory in the index and a tree
435 * in the tree. From a diff standpoint, that's a
436 * delete of the tree and a create of the file.
437 */
438 if (tree == o->df_conflict_entry)
439 tree = NULL;
440
b419482 @gitster diff-index --quiet: learn the "stop feeding the backend early" logic
gitster authored
441 if (ce_path_match(idx ? idx : tree, &revs->prune_data)) {
34110cd @torvalds Make 'unpack_trees()' have a separate source and destination index
torvalds authored
442 do_oneway_diff(o, idx, tree);
b419482 @gitster diff-index --quiet: learn the "stop feeding the backend early" logic
gitster authored
443 if (diff_can_quit_early(&revs->diffopt)) {
444 o->exiting_early = 1;
445 return -1;
446 }
447 }
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
448
34110cd @torvalds Make 'unpack_trees()' have a separate source and destination index
torvalds authored
449 return 0;
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
450 }
451
bf979c0 @gitster diff-lib: refactor run_diff_index() and do_diff_cache()
gitster authored
452 static int diff_cache(struct rev_info *revs,
453 const unsigned char *tree_sha1,
454 const char *tree_name,
455 int cached)
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
456 {
457 struct tree *tree;
458 struct tree_desc t;
bf979c0 @gitster diff-lib: refactor run_diff_index() and do_diff_cache()
gitster authored
459 struct unpack_trees_options opts;
e09ad6e Libify diff-index.
Junio C Hamano authored
460
bf979c0 @gitster diff-lib: refactor run_diff_index() and do_diff_cache()
gitster authored
461 tree = parse_tree_indirect(tree_sha1);
e09ad6e Libify diff-index.
Junio C Hamano authored
462 if (!tree)
bf979c0 @gitster diff-lib: refactor run_diff_index() and do_diff_cache()
gitster authored
463 return error("bad tree object %s",
464 tree_name ? tree_name : sha1_to_hex(tree_sha1));
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
465 memset(&opts, 0, sizeof(opts));
466 opts.head_idx = 1;
467 opts.index_only = cached;
a0919ce @gitster Avoid "diff-index --cached" optimization under --find-copies-harder
gitster authored
468 opts.diff_index_cached = (cached &&
469 !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER));
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
470 opts.merge = 1;
471 opts.fn = oneway_diff;
ff7e6aa Cleanup of unused symcache variable inside diff-lib.c
Kjetil Barvik authored
472 opts.unpack_data = revs;
34110cd @torvalds Make 'unpack_trees()' have a separate source and destination index
torvalds authored
473 opts.src_index = &the_index;
474 opts.dst_index = NULL;
2f88c19 @gitster diff-index: pass pathspec down to unpack-trees machinery
gitster authored
475 opts.pathspec = &revs->diffopt.pathspec;
4838237 @pclouds diff-index: enable recursive pathspec matching in unpack_trees
pclouds authored
476 opts.pathspec->recursive = 1;
477 opts.pathspec->max_depth = -1;
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
478
479 init_tree_desc(&t, tree->buffer, tree->size);
bf979c0 @gitster diff-lib: refactor run_diff_index() and do_diff_cache()
gitster authored
480 return unpack_trees(1, &t, &opts);
481 }
482
483 int run_diff_index(struct rev_info *revs, int cached)
484 {
485 struct object_array_entry *ent;
486
487 ent = revs->pending.objects;
488 if (diff_cache(revs, ent->item->sha1, ent->name, cached))
203a2fe Allow callers of unpack_trees() to handle failure
Daniel Barkalow authored
489 exit(128);
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
490
a5a818e @gitster diff: vary default prefix depending on what are compared
gitster authored
491 diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
730f728 @gitster unpack-trees.c: look ahead in the index
gitster authored
492 diffcore_fix_diff_index(&revs->diffopt);
e09ad6e Libify diff-index.
Junio C Hamano authored
493 diffcore_std(&revs->diffopt);
494 diff_flush(&revs->diffopt);
d1f2d7e @torvalds Make run_diff_index() use unpack_trees(), not read_tree()
torvalds authored
495 return 0;
e09ad6e Libify diff-index.
Junio C Hamano authored
496 }
1cfe773 git-blame: no rev means start from the working tree file.
Junio C Hamano authored
497
498 int do_diff_cache(const unsigned char *tree_sha1, struct diff_options *opt)
499 {
500 struct rev_info revs;
501
502 init_revisions(&revs, NULL);
afe069d @pclouds struct rev_info: convert prune_data to struct pathspec
pclouds authored
503 init_pathspec(&revs.prune_data, opt->pathspec.raw);
bf979c0 @gitster diff-lib: refactor run_diff_index() and do_diff_cache()
gitster authored
504 revs.diffopt = *opt;
204ce97 @dscho Also use unpack_trees() in do_diff_cache()
dscho authored
505
bf979c0 @gitster diff-lib: refactor run_diff_index() and do_diff_cache()
gitster authored
506 if (diff_cache(&revs, tree_sha1, NULL, 1))
203a2fe Allow callers of unpack_trees() to handle failure
Daniel Barkalow authored
507 exit(128);
204ce97 @dscho Also use unpack_trees() in do_diff_cache()
dscho authored
508 return 0;
1cfe773 git-blame: no rev means start from the working tree file.
Junio C Hamano authored
509 }
75f3ff2 @sbeyer Generalize and libify index_is_dirty() to index_differs_from(...)
sbeyer authored
510
511 int index_differs_from(const char *def, int diff_flags)
512 {
513 struct rev_info rev;
32962c9 @gitster revision: introduce setup_revision_opt
gitster authored
514 struct setup_revision_opt opt;
75f3ff2 @sbeyer Generalize and libify index_is_dirty() to index_differs_from(...)
sbeyer authored
515
516 init_revisions(&rev, NULL);
32962c9 @gitster revision: introduce setup_revision_opt
gitster authored
517 memset(&opt, 0, sizeof(opt));
518 opt.def = def;
519 setup_revisions(0, NULL, &rev, &opt);
90b1994 @gitster diff: Rename QUIET internal option to QUICK
gitster authored
520 DIFF_OPT_SET(&rev.diffopt, QUICK);
75f3ff2 @sbeyer Generalize and libify index_is_dirty() to index_differs_from(...)
sbeyer authored
521 DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
522 rev.diffopt.flags |= diff_flags;
523 run_diff_index(&rev, 1);
524 if (rev.pending.alloc)
525 free(rev.pending.objects);
526 return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0);
527 }
Something went wrong with that request. Please try again.