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