gitk: Second try to work around the command line limit on Windows
[git/dscho.git] / builtin / diff.c
blobffcdd055ca0b9b30bec2ce1f22e348ec15d58c81
1 /*
2 * Builtin "git diff"
4 * Copyright (c) 2006 Junio C Hamano
5 */
6 #include "cache.h"
7 #include "color.h"
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"
17 struct blobinfo {
18 unsigned char sha1[20];
19 const char *name;
20 unsigned mode;
23 static const char builtin_diff_usage[] =
24 "git diff <options> <rev>{0,2} -- <path>*";
26 static 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)
33 struct diff_filespec *one, *two;
35 if (!is_null_sha1(old_sha1) && !is_null_sha1(new_sha1) &&
36 !hashcmp(old_sha1, new_sha1) && (old_mode == new_mode))
37 return;
39 if (DIFF_OPT_TST(opt, REVERSE_DIFF)) {
40 unsigned tmp;
41 const unsigned char *tmp_u;
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;
48 if (opt->prefix &&
49 (strncmp(old_name, opt->prefix, opt->prefix_length) ||
50 strncmp(new_name, opt->prefix, opt->prefix_length)))
51 return;
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);
58 diff_queue(&diff_queued_diff, one, two);
61 static int builtin_diff_b_f(struct rev_info *revs,
62 int argc, const char **argv,
63 struct blobinfo *blob,
64 const char *path)
66 /* Blob vs file in the working tree*/
67 struct stat st;
69 if (argc > 1)
70 usage(builtin_diff_usage);
72 if (lstat(path, &st))
73 die_errno("failed to stat '%s'", path);
74 if (!(S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)))
75 die("'%s': not a regular file or symlink", path);
77 diff_set_mnemonic_prefix(&revs->diffopt, "o/", "w/");
79 if (blob[0].mode == S_IFINVALID)
80 blob[0].mode = canon_mode(st.st_mode);
82 stuff_change(&revs->diffopt,
83 blob[0].mode, canon_mode(st.st_mode),
84 blob[0].sha1, null_sha1,
85 path, path);
86 diffcore_std(&revs->diffopt);
87 diff_flush(&revs->diffopt);
88 return 0;
91 static int builtin_diff_blobs(struct rev_info *revs,
92 int argc, const char **argv,
93 struct blobinfo *blob)
95 unsigned mode = canon_mode(S_IFREG | 0644);
97 if (argc > 1)
98 usage(builtin_diff_usage);
100 if (blob[0].mode == S_IFINVALID)
101 blob[0].mode = mode;
103 if (blob[1].mode == S_IFINVALID)
104 blob[1].mode = mode;
106 stuff_change(&revs->diffopt,
107 blob[0].mode, blob[1].mode,
108 blob[0].sha1, blob[1].sha1,
109 blob[0].name, blob[1].name);
110 diffcore_std(&revs->diffopt);
111 diff_flush(&revs->diffopt);
112 return 0;
115 static int builtin_diff_index(struct rev_info *revs,
116 int argc, const char **argv)
118 int cached = 0;
119 while (1 < argc) {
120 const char *arg = argv[1];
121 if (!strcmp(arg, "--cached") || !strcmp(arg, "--staged"))
122 cached = 1;
123 else
124 usage(builtin_diff_usage);
125 argv++; argc--;
127 if (!cached)
128 setup_work_tree();
130 * Make sure there is one revision (i.e. pending object),
131 * and there is no revision filtering parameters.
133 if (revs->pending.nr != 1 ||
134 revs->max_count != -1 || revs->min_age != -1 ||
135 revs->max_age != -1)
136 usage(builtin_diff_usage);
137 if (read_cache_preload(revs->diffopt.paths) < 0) {
138 perror("read_cache_preload");
139 return -1;
141 return run_diff_index(revs, cached);
144 static int builtin_diff_tree(struct rev_info *revs,
145 int argc, const char **argv,
146 struct object_array_entry *ent)
148 const unsigned char *(sha1[2]);
149 int swap = 0;
151 if (argc > 1)
152 usage(builtin_diff_usage);
154 /* We saw two trees, ent[0] and ent[1].
155 * if ent[1] is uninteresting, they are swapped
157 if (ent[1].item->flags & UNINTERESTING)
158 swap = 1;
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;
166 static int builtin_diff_combined(struct rev_info *revs,
167 int argc, const char **argv,
168 struct object_array_entry *ent,
169 int ents)
171 const unsigned char (*parent)[20];
172 int i;
174 if (argc > 1)
175 usage(builtin_diff_usage);
177 if (!revs->dense_combined_merges && !revs->combine_merges)
178 revs->dense_combined_merges = revs->combine_merges = 1;
179 parent = xmalloc(ents * sizeof(*parent));
180 for (i = 0; i < ents; i++)
181 hashcpy((unsigned char *)(parent + i), ent[i].item->sha1);
182 diff_tree_combined(parent[0], parent + 1, ents - 1,
183 revs->dense_combined_merges, revs);
184 return 0;
187 static void refresh_index_quietly(void)
189 struct lock_file *lock_file;
190 int fd;
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);
200 if (active_cache_changed &&
201 !write_cache(fd, active_cache, active_nr))
202 commit_locked_index(lock_file);
204 rollback_lock_file(lock_file);
207 static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv)
209 int result;
210 unsigned int options = 0;
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 if (!strcmp(argv[1], "-h"))
222 usage(builtin_diff_usage);
223 else
224 return error("invalid option: %s", argv[1]);
225 argv++; argc--;
229 * "diff --base" should not combine merges because it was not
230 * asked to. "diff -c" should not densify (if the user wants
231 * dense one, --cc can be explicitly asked for, or just rely
232 * on the default).
234 if (revs->max_count == -1 && !revs->combine_merges &&
235 (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
236 revs->combine_merges = revs->dense_combined_merges = 1;
238 setup_work_tree();
239 if (read_cache_preload(revs->diffopt.paths) < 0) {
240 perror("read_cache_preload");
241 return -1;
243 result = run_diff_files(revs, options);
244 return diff_result_code(&revs->diffopt, result);
247 int cmd_diff(int argc, const char **argv, const char *prefix)
249 int i;
250 struct rev_info rev;
251 struct object_array_entry ent[100];
252 int ents = 0, blobs = 0, paths = 0;
253 const char *path = NULL;
254 struct blobinfo blob[2];
255 int nongit;
256 int result = 0;
259 * We could get N tree-ish in the rev.pending_objects list.
260 * Also there could be M blobs there, and P pathspecs.
262 * N=0, M=0:
263 * cache vs files (diff-files)
264 * N=0, M=2:
265 * compare two random blobs. P must be zero.
266 * N=0, M=1, P=1:
267 * compare a blob with a working tree file.
269 * N=1, M=0:
270 * tree vs cache (diff-index --cached)
272 * N=2, M=0:
273 * tree vs tree (diff-tree)
275 * N=0, M=0, P=2:
276 * compare two filesystem entities (aka --no-index).
278 * Other cases are errors.
281 prefix = setup_git_directory_gently(&nongit);
282 git_config(git_diff_ui_config, NULL);
284 if (diff_use_color_default == -1)
285 diff_use_color_default = git_use_color_default;
287 init_revisions(&rev, prefix);
289 /* If this is a no-index diff, just run it and exit there. */
290 diff_no_index(&rev, argc, argv, nongit, prefix);
292 /* Otherwise, we are doing the usual "git" diff */
293 rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
295 /* Default to let external and textconv be used */
296 DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL);
297 DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
299 if (nongit)
300 die("Not a git repository");
301 argc = setup_revisions(argc, argv, &rev, NULL);
302 if (!rev.diffopt.output_format) {
303 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
304 if (diff_setup_done(&rev.diffopt) < 0)
305 die("diff_setup_done failed");
308 DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
311 * If the user asked for our exit code then don't start a
312 * pager or we would end up reporting its exit code instead.
314 if (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS) &&
315 check_pager_config("diff") != 0)
316 setup_pager();
319 * Do we have --cached and not have a pending object, then
320 * default to HEAD by hand. Eek.
322 if (!rev.pending.nr) {
323 int i;
324 for (i = 1; i < argc; i++) {
325 const char *arg = argv[i];
326 if (!strcmp(arg, "--"))
327 break;
328 else if (!strcmp(arg, "--cached") ||
329 !strcmp(arg, "--staged")) {
330 add_head_to_pending(&rev);
331 if (!rev.pending.nr)
332 die("No HEAD commit to compare with (yet)");
333 break;
338 for (i = 0; i < rev.pending.nr; i++) {
339 struct object_array_entry *list = rev.pending.objects+i;
340 struct object *obj = list->item;
341 const char *name = list->name;
342 int flags = (obj->flags & UNINTERESTING);
343 if (!obj->parsed)
344 obj = parse_object(obj->sha1);
345 obj = deref_tag(obj, NULL, 0);
346 if (!obj)
347 die("invalid object '%s' given.", name);
348 if (obj->type == OBJ_COMMIT)
349 obj = &((struct commit *)obj)->tree->object;
350 if (obj->type == OBJ_TREE) {
351 if (ARRAY_SIZE(ent) <= ents)
352 die("more than %d trees given: '%s'",
353 (int) ARRAY_SIZE(ent), name);
354 obj->flags |= flags;
355 ent[ents].item = obj;
356 ent[ents].name = name;
357 ents++;
358 continue;
360 if (obj->type == OBJ_BLOB) {
361 if (2 <= blobs)
362 die("more than two blobs given: '%s'", name);
363 hashcpy(blob[blobs].sha1, obj->sha1);
364 blob[blobs].name = name;
365 blob[blobs].mode = list->mode;
366 blobs++;
367 continue;
370 die("unhandled object '%s' given.", name);
372 if (rev.prune_data) {
373 const char **pathspec = rev.prune_data;
374 while (*pathspec) {
375 if (!path)
376 path = *pathspec;
377 paths++;
378 pathspec++;
383 * Now, do the arguments look reasonable?
385 if (!ents) {
386 switch (blobs) {
387 case 0:
388 result = builtin_diff_files(&rev, argc, argv);
389 break;
390 case 1:
391 if (paths != 1)
392 usage(builtin_diff_usage);
393 result = builtin_diff_b_f(&rev, argc, argv, blob, path);
394 break;
395 case 2:
396 if (paths)
397 usage(builtin_diff_usage);
398 result = builtin_diff_blobs(&rev, argc, argv, blob);
399 break;
400 default:
401 usage(builtin_diff_usage);
404 else if (blobs)
405 usage(builtin_diff_usage);
406 else if (ents == 1)
407 result = builtin_diff_index(&rev, argc, argv);
408 else if (ents == 2)
409 result = builtin_diff_tree(&rev, argc, argv, ent);
410 else if ((ents == 3) && (ent[0].item->flags & UNINTERESTING)) {
411 /* diff A...B where there is one sane merge base between
412 * A and B. We have ent[0] == merge-base, ent[1] == A,
413 * and ent[2] == B. Show diff between the base and B.
415 ent[1] = ent[2];
416 result = builtin_diff_tree(&rev, argc, argv, ent);
418 else
419 result = builtin_diff_combined(&rev, argc, argv,
420 ent, ents);
421 result = diff_result_code(&rev.diffopt, result);
422 if (1 < rev.diffopt.skip_stat_unmatch)
423 refresh_index_quietly();
424 return result;