Add cache preload facility
[git/git.git] / builtin-diff.c
CommitLineData
65056021
JH
1/*
2 * Builtin "git diff"
3 *
4 * Copyright (c) 2006 Junio C Hamano
5 */
6#include "cache.h"
6b2f2d98 7#include "color.h"
65056021
JH
8#include "commit.h"
9#include "blob.h"
10#include "tag.h"
11#include "diff.h"
12#include "diffcore.h"
13#include "revision.h"
14#include "log-tree.h"
15#include "builtin.h"
16
65056021
JH
17struct blobinfo {
18 unsigned char sha1[20];
19 const char *name;
01618a3a 20 unsigned mode;
65056021
JH
21};
22
23static const char builtin_diff_usage[] =
1b1dd23f 24"git diff <options> <rev>{0,2} -- <path>*";
65056021 25
65056021
JH
26static void stuff_change(struct diff_options *opt,
27 unsigned old_mode, unsigned new_mode,
28 const unsigned char *old_sha1,
29 const unsigned char *new_sha1,
30 const char *old_name,
31 const char *new_name)
32{
33 struct diff_filespec *one, *two;
34
0bef57ee 35 if (!is_null_sha1(old_sha1) && !is_null_sha1(new_sha1) &&
43342941 36 !hashcmp(old_sha1, new_sha1) && (old_mode == new_mode))
65056021
JH
37 return;
38
8f67f8ae 39 if (DIFF_OPT_TST(opt, REVERSE_DIFF)) {
65056021 40 unsigned tmp;
d92f1dc6 41 const unsigned char *tmp_u;
65056021
JH
42 const char *tmp_c;
43 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
44 tmp_u = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_u;
45 tmp_c = old_name; old_name = new_name; new_name = tmp_c;
46 }
cd676a51
JH
47
48 if (opt->prefix &&
49 (strncmp(old_name, opt->prefix, opt->prefix_length) ||
50 strncmp(new_name, opt->prefix, opt->prefix_length)))
51 return;
52
65056021
JH
53 one = alloc_filespec(old_name);
54 two = alloc_filespec(new_name);
55 fill_filespec(one, old_sha1, old_mode);
56 fill_filespec(two, new_sha1, new_mode);
57
65056021
JH
58 diff_queue(&diff_queued_diff, one, two);
59}
60
61static int builtin_diff_b_f(struct rev_info *revs,
62 int argc, const char **argv,
63 struct blobinfo *blob,
64 const char *path)
65{
66 /* Blob vs file in the working tree*/
67 struct stat st;
68
a610786f
TH
69 if (argc > 1)
70 usage(builtin_diff_usage);
71
65056021
JH
72 if (lstat(path, &st))
73 die("'%s': %s", path, strerror(errno));
74 if (!(S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)))
75 die("'%s': not a regular file or symlink", path);
01618a3a 76
a5a818ee
JH
77 diff_set_mnemonic_prefix(&revs->diffopt, "o/", "w/");
78
01618a3a
MK
79 if (blob[0].mode == S_IFINVALID)
80 blob[0].mode = canon_mode(st.st_mode);
81
65056021 82 stuff_change(&revs->diffopt,
01618a3a 83 blob[0].mode, canon_mode(st.st_mode),
65056021 84 blob[0].sha1, null_sha1,
065e0b12 85 path, path);
65056021
JH
86 diffcore_std(&revs->diffopt);
87 diff_flush(&revs->diffopt);
88 return 0;
89}
90
91static int builtin_diff_blobs(struct rev_info *revs,
92 int argc, const char **argv,
93 struct blobinfo *blob)
94{
65056021
JH
95 unsigned mode = canon_mode(S_IFREG | 0644);
96
a610786f
TH
97 if (argc > 1)
98 usage(builtin_diff_usage);
99
01618a3a
MK
100 if (blob[0].mode == S_IFINVALID)
101 blob[0].mode = mode;
102
103 if (blob[1].mode == S_IFINVALID)
104 blob[1].mode = mode;
105
65056021 106 stuff_change(&revs->diffopt,
01618a3a 107 blob[0].mode, blob[1].mode,
f82cd3c6 108 blob[0].sha1, blob[1].sha1,
53dd8a9c 109 blob[0].name, blob[1].name);
65056021
JH
110 diffcore_std(&revs->diffopt);
111 diff_flush(&revs->diffopt);
112 return 0;
113}
114
115static int builtin_diff_index(struct rev_info *revs,
116 int argc, const char **argv)
117{
118 int cached = 0;
119 while (1 < argc) {
120 const char *arg = argv[1];
2baf1850 121 if (!strcmp(arg, "--cached") || !strcmp(arg, "--staged"))
65056021 122 cached = 1;
65056021
JH
123 else
124 usage(builtin_diff_usage);
125 argv++; argc--;
126 }
4f38f6b5
NTND
127 if (!cached)
128 setup_work_tree();
65056021
JH
129 /*
130 * Make sure there is one revision (i.e. pending object),
131 * and there is no revision filtering parameters.
132 */
1f1e895f 133 if (revs->pending.nr != 1 ||
65056021
JH
134 revs->max_count != -1 || revs->min_age != -1 ||
135 revs->max_age != -1)
136 usage(builtin_diff_usage);
671c9b7e
LT
137 if (read_cache_preload(revs->diffopt.paths) < 0) {
138 perror("read_cache_preload");
b4e1e4a7
JH
139 return -1;
140 }
65056021
JH
141 return run_diff_index(revs, cached);
142}
143
144static int builtin_diff_tree(struct rev_info *revs,
145 int argc, const char **argv,
1f1e895f 146 struct object_array_entry *ent)
65056021 147{
65056021 148 const unsigned char *(sha1[2]);
1f1e895f 149 int swap = 0;
a610786f
TH
150
151 if (argc > 1)
152 usage(builtin_diff_usage);
0fe7c1de
JH
153
154 /* We saw two trees, ent[0] and ent[1].
82e5a82f 155 * if ent[1] is uninteresting, they are swapped
0fe7c1de 156 */
1f1e895f
LT
157 if (ent[1].item->flags & UNINTERESTING)
158 swap = 1;
65056021
JH
159 sha1[swap] = ent[0].item->sha1;
160 sha1[1-swap] = ent[1].item->sha1;
161 diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt);
162 log_tree_diff_flush(revs);
163 return 0;
164}
165
0fe7c1de
JH
166static int builtin_diff_combined(struct rev_info *revs,
167 int argc, const char **argv,
1f1e895f 168 struct object_array_entry *ent,
0fe7c1de
JH
169 int ents)
170{
171 const unsigned char (*parent)[20];
172 int i;
173
a610786f
TH
174 if (argc > 1)
175 usage(builtin_diff_usage);
176
0fe7c1de
JH
177 if (!revs->dense_combined_merges && !revs->combine_merges)
178 revs->dense_combined_merges = revs->combine_merges = 1;
179 parent = xmalloc(ents * sizeof(*parent));
0fe7c1de 180 for (i = 0; i < ents; i++)
b75271d9 181 hashcpy((unsigned char *)(parent + i), ent[i].item->sha1);
0fe7c1de
JH
182 diff_tree_combined(parent[0], parent + 1, ents - 1,
183 revs->dense_combined_merges, revs);
184 return 0;
185}
186
aecbf914
JH
187static void refresh_index_quietly(void)
188{
189 struct lock_file *lock_file;
190 int fd;
191
192 lock_file = xcalloc(1, sizeof(struct lock_file));
193 fd = hold_locked_index(lock_file, 0);
194 if (fd < 0)
195 return;
196 discard_cache();
197 read_cache();
198 refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED);
fbbdbfc3
JH
199
200 if (active_cache_changed &&
4ed7cd3a 201 !write_cache(fd, active_cache, active_nr))
fbbdbfc3
JH
202 commit_locked_index(lock_file);
203
aecbf914
JH
204 rollback_lock_file(lock_file);
205}
206
0569e9b8
JH
207static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv)
208{
209 int result;
210 unsigned int options = 0;
211
212 while (1 < argc && argv[1][0] == '-') {
213 if (!strcmp(argv[1], "--base"))
214 revs->max_count = 1;
215 else if (!strcmp(argv[1], "--ours"))
216 revs->max_count = 2;
217 else if (!strcmp(argv[1], "--theirs"))
218 revs->max_count = 3;
219 else if (!strcmp(argv[1], "-q"))
220 options |= DIFF_SILENT_ON_REMOVED;
221 else
222 return error("invalid option: %s", argv[1]);
223 argv++; argc--;
224 }
225
903e09a3
JH
226 /*
227 * "diff --base" should not combine merges because it was not
228 * asked to. "diff -c" should not densify (if the user wants
229 * dense one, --cc can be explicitly asked for, or just rely
230 * on the default).
231 */
232 if (revs->max_count == -1 && !revs->combine_merges &&
0569e9b8
JH
233 (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
234 revs->combine_merges = revs->dense_combined_merges = 1;
235
4f38f6b5 236 setup_work_tree();
671c9b7e
LT
237 if (read_cache_preload(revs->diffopt.paths) < 0) {
238 perror("read_cache_preload");
0569e9b8
JH
239 return -1;
240 }
241 result = run_diff_files(revs, options);
242 return diff_result_code(&revs->diffopt, result);
243}
244
a633fca0 245int cmd_diff(int argc, const char **argv, const char *prefix)
65056021 246{
1f1e895f 247 int i;
65056021 248 struct rev_info rev;
1f1e895f 249 struct object_array_entry ent[100];
65056021 250 int ents = 0, blobs = 0, paths = 0;
a633fca0 251 const char *path = NULL;
65056021 252 struct blobinfo blob[2];
af05d679 253 int nongit;
41bbf9d5 254 int result = 0;
65056021
JH
255
256 /*
257 * We could get N tree-ish in the rev.pending_objects list.
258 * Also there could be M blobs there, and P pathspecs.
259 *
260 * N=0, M=0:
261 * cache vs files (diff-files)
262 * N=0, M=2:
263 * compare two random blobs. P must be zero.
264 * N=0, M=1, P=1:
265 * compare a blob with a working tree file.
266 *
267 * N=1, M=0:
268 * tree vs cache (diff-index --cached)
269 *
270 * N=2, M=0:
271 * tree vs tree (diff-tree)
272 *
0569e9b8
JH
273 * N=0, M=0, P=2:
274 * compare two filesystem entities (aka --no-index).
275 *
65056021
JH
276 * Other cases are errors.
277 */
230f544e 278
d516c2d1 279 prefix = setup_git_directory_gently(&nongit);
ef90d6d4 280 git_config(git_diff_ui_config, NULL);
6b2f2d98
MK
281
282 if (diff_use_color_default == -1)
283 diff_use_color_default = git_use_color_default;
284
db6296a5 285 init_revisions(&rev, prefix);
0569e9b8
JH
286
287 /* If this is a no-index diff, just run it and exit there. */
288 diff_no_index(&rev, argc, argv, nongit, prefix);
289
290 /* Otherwise, we are doing the usual "git" diff */
aecbf914 291 rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
65056021 292
0569e9b8
JH
293 if (nongit)
294 die("Not a git repository");
295 argc = setup_revisions(argc, argv, &rev, NULL);
047fbe90 296 if (!rev.diffopt.output_format) {
c9b5ef99 297 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
72ee96c0
JH
298 if (diff_setup_done(&rev.diffopt) < 0)
299 die("diff_setup_done failed");
047fbe90 300 }
8f67f8ae
PH
301 DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL);
302 DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
c7534ef4 303 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
c9b5ef99 304
da31b358
JH
305 /*
306 * If the user asked for our exit code then don't start a
89d07f75
RS
307 * pager or we would end up reporting its exit code instead.
308 */
8f0359f0
AR
309 if (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS) &&
310 check_pager_config("diff") != 0)
89d07f75
RS
311 setup_pager();
312
0569e9b8
JH
313 /*
314 * Do we have --cached and not have a pending object, then
65056021
JH
315 * default to HEAD by hand. Eek.
316 */
1f1e895f 317 if (!rev.pending.nr) {
65056021
JH
318 int i;
319 for (i = 1; i < argc; i++) {
320 const char *arg = argv[i];
321 if (!strcmp(arg, "--"))
322 break;
2baf1850
DS
323 else if (!strcmp(arg, "--cached") ||
324 !strcmp(arg, "--staged")) {
3384a2df 325 add_head_to_pending(&rev);
6c09c451
JH
326 if (!rev.pending.nr)
327 die("No HEAD commit to compare with (yet)");
65056021
JH
328 break;
329 }
330 }
331 }
332
1f1e895f
LT
333 for (i = 0; i < rev.pending.nr; i++) {
334 struct object_array_entry *list = rev.pending.objects+i;
65056021
JH
335 struct object *obj = list->item;
336 const char *name = list->name;
337 int flags = (obj->flags & UNINTERESTING);
338 if (!obj->parsed)
339 obj = parse_object(obj->sha1);
340 obj = deref_tag(obj, NULL, 0);
341 if (!obj)
342 die("invalid object '%s' given.", name);
1974632c 343 if (obj->type == OBJ_COMMIT)
65056021 344 obj = &((struct commit *)obj)->tree->object;
1974632c 345 if (obj->type == OBJ_TREE) {
0fe7c1de
JH
346 if (ARRAY_SIZE(ent) <= ents)
347 die("more than %d trees given: '%s'",
334b506a 348 (int) ARRAY_SIZE(ent), name);
65056021
JH
349 obj->flags |= flags;
350 ent[ents].item = obj;
351 ent[ents].name = name;
352 ents++;
353 continue;
354 }
1974632c 355 if (obj->type == OBJ_BLOB) {
65056021
JH
356 if (2 <= blobs)
357 die("more than two blobs given: '%s'", name);
e702496e 358 hashcpy(blob[blobs].sha1, obj->sha1);
65056021 359 blob[blobs].name = name;
01618a3a 360 blob[blobs].mode = list->mode;
65056021
JH
361 blobs++;
362 continue;
230f544e 363
65056021
JH
364 }
365 die("unhandled object '%s' given.", name);
366 }
367 if (rev.prune_data) {
368 const char **pathspec = rev.prune_data;
369 while (*pathspec) {
370 if (!path)
371 path = *pathspec;
372 paths++;
373 pathspec++;
374 }
375 }
376
377 /*
378 * Now, do the arguments look reasonable?
379 */
380 if (!ents) {
381 switch (blobs) {
382 case 0:
0569e9b8 383 result = builtin_diff_files(&rev, argc, argv);
65056021
JH
384 break;
385 case 1:
386 if (paths != 1)
387 usage(builtin_diff_usage);
41bbf9d5 388 result = builtin_diff_b_f(&rev, argc, argv, blob, path);
65056021
JH
389 break;
390 case 2:
0fe7c1de
JH
391 if (paths)
392 usage(builtin_diff_usage);
41bbf9d5 393 result = builtin_diff_blobs(&rev, argc, argv, blob);
65056021
JH
394 break;
395 default:
396 usage(builtin_diff_usage);
397 }
398 }
399 else if (blobs)
400 usage(builtin_diff_usage);
401 else if (ents == 1)
41bbf9d5 402 result = builtin_diff_index(&rev, argc, argv);
65056021 403 else if (ents == 2)
41bbf9d5 404 result = builtin_diff_tree(&rev, argc, argv, ent);
9919f41c
JH
405 else if ((ents == 3) && (ent[0].item->flags & UNINTERESTING)) {
406 /* diff A...B where there is one sane merge base between
407 * A and B. We have ent[0] == merge-base, ent[1] == A,
408 * and ent[2] == B. Show diff between the base and B.
409 */
306ea2df 410 ent[1] = ent[2];
41bbf9d5 411 result = builtin_diff_tree(&rev, argc, argv, ent);
9919f41c 412 }
0fe7c1de 413 else
41bbf9d5 414 result = builtin_diff_combined(&rev, argc, argv,
9919f41c 415 ent, ents);
da31b358 416 result = diff_result_code(&rev.diffopt, result);
aecbf914
JH
417 if (1 < rev.diffopt.skip_stat_unmatch)
418 refresh_index_quietly();
41bbf9d5 419 return result;
65056021 420}