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