blob: 4c289e798a25ee3893a483abd8465740999dcbef [file] [log] [blame]
Junio C Hamano65056022006-04-28 23:20:52 -07001/*
2 * Builtin "git diff"
3 *
4 * Copyright (c) 2006 Junio C Hamano
5 */
6#include "cache.h"
Matthias Kestenholz6b2f2d92008-02-18 08:26:03 +01007#include "color.h"
Junio C Hamano65056022006-04-28 23:20:52 -07008#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
Junio C Hamano65056022006-04-28 23:20:52 -070017struct blobinfo {
18 unsigned char sha1[20];
19 const char *name;
Martin Koegler01618a32007-04-22 18:44:00 +020020 unsigned mode;
Junio C Hamano65056022006-04-28 23:20:52 -070021};
22
23static const char builtin_diff_usage[] =
Ramsay Allan Jones15e593e2006-08-03 16:38:39 +010024"git-diff <options> <rev>{0,2} -- <path>*";
Junio C Hamano65056022006-04-28 23:20:52 -070025
Junio C Hamano65056022006-04-28 23:20:52 -070026static 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
David Rientjes0bef57e2006-08-15 13:37:19 -070035 if (!is_null_sha1(old_sha1) && !is_null_sha1(new_sha1) &&
Junio C Hamano43342942007-04-22 23:56:22 -070036 !hashcmp(old_sha1, new_sha1) && (old_mode == new_mode))
Junio C Hamano65056022006-04-28 23:20:52 -070037 return;
38
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +010039 if (DIFF_OPT_TST(opt, REVERSE_DIFF)) {
Junio C Hamano65056022006-04-28 23:20:52 -070040 unsigned tmp;
Peter Hagervalld92f1dc2006-05-07 16:50:47 +020041 const unsigned char *tmp_u;
Junio C Hamano65056022006-04-28 23:20:52 -070042 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 }
Junio C Hamanocd676a52008-02-12 14:26:02 -080047
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
Junio C Hamano65056022006-04-28 23:20:52 -070053 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
Junio C Hamano65056022006-04-28 23:20:52 -070058 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
Timo Hirvonena6107862006-06-24 20:23:06 +030069 if (argc > 1)
70 usage(builtin_diff_usage);
71
Junio C Hamano65056022006-04-28 23:20:52 -070072 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);
Martin Koegler01618a32007-04-22 18:44:00 +020076
77 if (blob[0].mode == S_IFINVALID)
78 blob[0].mode = canon_mode(st.st_mode);
79
Junio C Hamano65056022006-04-28 23:20:52 -070080 stuff_change(&revs->diffopt,
Martin Koegler01618a32007-04-22 18:44:00 +020081 blob[0].mode, canon_mode(st.st_mode),
Junio C Hamano65056022006-04-28 23:20:52 -070082 blob[0].sha1, null_sha1,
Junio C Hamano065e0b12006-05-18 14:35:37 -070083 path, path);
Junio C Hamano65056022006-04-28 23:20:52 -070084 diffcore_std(&revs->diffopt);
85 diff_flush(&revs->diffopt);
86 return 0;
87}
88
89static int builtin_diff_blobs(struct rev_info *revs,
90 int argc, const char **argv,
91 struct blobinfo *blob)
92{
Junio C Hamano65056022006-04-28 23:20:52 -070093 unsigned mode = canon_mode(S_IFREG | 0644);
94
Timo Hirvonena6107862006-06-24 20:23:06 +030095 if (argc > 1)
96 usage(builtin_diff_usage);
97
Martin Koegler01618a32007-04-22 18:44:00 +020098 if (blob[0].mode == S_IFINVALID)
99 blob[0].mode = mode;
100
101 if (blob[1].mode == S_IFINVALID)
102 blob[1].mode = mode;
103
Junio C Hamano65056022006-04-28 23:20:52 -0700104 stuff_change(&revs->diffopt,
Martin Koegler01618a32007-04-22 18:44:00 +0200105 blob[0].mode, blob[1].mode,
Junio C Hamanof82cd3c2006-08-03 11:50:10 -0700106 blob[0].sha1, blob[1].sha1,
Junio C Hamano53dd8a92006-08-03 11:57:11 -0700107 blob[0].name, blob[1].name);
Junio C Hamano65056022006-04-28 23:20:52 -0700108 diffcore_std(&revs->diffopt);
109 diff_flush(&revs->diffopt);
110 return 0;
111}
112
113static int builtin_diff_index(struct rev_info *revs,
114 int argc, const char **argv)
115{
116 int cached = 0;
117 while (1 < argc) {
118 const char *arg = argv[1];
Junio C Hamanof2dd1c92006-12-13 01:33:43 -0800119 if (!strcmp(arg, "--cached"))
Junio C Hamano65056022006-04-28 23:20:52 -0700120 cached = 1;
Junio C Hamano65056022006-04-28 23:20:52 -0700121 else
122 usage(builtin_diff_usage);
123 argv++; argc--;
124 }
125 /*
126 * Make sure there is one revision (i.e. pending object),
127 * and there is no revision filtering parameters.
128 */
Linus Torvalds1f1e8952006-06-19 17:42:35 -0700129 if (revs->pending.nr != 1 ||
Junio C Hamano65056022006-04-28 23:20:52 -0700130 revs->max_count != -1 || revs->min_age != -1 ||
131 revs->max_age != -1)
132 usage(builtin_diff_usage);
Junio C Hamanob4e1e4a2007-02-09 18:51:40 -0800133 if (read_cache() < 0) {
134 perror("read_cache");
135 return -1;
136 }
Junio C Hamano65056022006-04-28 23:20:52 -0700137 return run_diff_index(revs, cached);
138}
139
140static int builtin_diff_tree(struct rev_info *revs,
141 int argc, const char **argv,
Linus Torvalds1f1e8952006-06-19 17:42:35 -0700142 struct object_array_entry *ent)
Junio C Hamano65056022006-04-28 23:20:52 -0700143{
Junio C Hamano65056022006-04-28 23:20:52 -0700144 const unsigned char *(sha1[2]);
Linus Torvalds1f1e8952006-06-19 17:42:35 -0700145 int swap = 0;
Timo Hirvonena6107862006-06-24 20:23:06 +0300146
147 if (argc > 1)
148 usage(builtin_diff_usage);
Junio C Hamano0fe7c1d2006-04-29 01:24:49 -0700149
150 /* We saw two trees, ent[0] and ent[1].
Pavel Roskin82e5a822006-07-10 01:50:18 -0400151 * if ent[1] is uninteresting, they are swapped
Junio C Hamano0fe7c1d2006-04-29 01:24:49 -0700152 */
Linus Torvalds1f1e8952006-06-19 17:42:35 -0700153 if (ent[1].item->flags & UNINTERESTING)
154 swap = 1;
Junio C Hamano65056022006-04-28 23:20:52 -0700155 sha1[swap] = ent[0].item->sha1;
156 sha1[1-swap] = ent[1].item->sha1;
157 diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt);
158 log_tree_diff_flush(revs);
159 return 0;
160}
161
Junio C Hamano0fe7c1d2006-04-29 01:24:49 -0700162static int builtin_diff_combined(struct rev_info *revs,
163 int argc, const char **argv,
Linus Torvalds1f1e8952006-06-19 17:42:35 -0700164 struct object_array_entry *ent,
Junio C Hamano0fe7c1d2006-04-29 01:24:49 -0700165 int ents)
166{
167 const unsigned char (*parent)[20];
168 int i;
169
Timo Hirvonena6107862006-06-24 20:23:06 +0300170 if (argc > 1)
171 usage(builtin_diff_usage);
172
Junio C Hamano0fe7c1d2006-04-29 01:24:49 -0700173 if (!revs->dense_combined_merges && !revs->combine_merges)
174 revs->dense_combined_merges = revs->combine_merges = 1;
175 parent = xmalloc(ents * sizeof(*parent));
176 /* Again, the revs are all reverse */
177 for (i = 0; i < ents; i++)
Johannes Schindelin75b62b42007-02-23 05:20:32 +0100178 hashcpy((unsigned char *)(parent + i),
179 ent[ents - 1 - i].item->sha1);
Junio C Hamano0fe7c1d2006-04-29 01:24:49 -0700180 diff_tree_combined(parent[0], parent + 1, ents - 1,
181 revs->dense_combined_merges, revs);
182 return 0;
183}
184
Junio C Hamanoaecbf912007-08-31 13:13:42 -0700185static void refresh_index_quietly(void)
186{
187 struct lock_file *lock_file;
188 int fd;
189
190 lock_file = xcalloc(1, sizeof(struct lock_file));
191 fd = hold_locked_index(lock_file, 0);
192 if (fd < 0)
193 return;
194 discard_cache();
195 read_cache();
196 refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED);
Junio C Hamanofbbdbfc2007-11-08 16:24:00 -0800197
198 if (active_cache_changed &&
Brandon Casey4ed7cd32008-01-16 13:12:46 -0600199 !write_cache(fd, active_cache, active_nr))
Junio C Hamanofbbdbfc2007-11-08 16:24:00 -0800200 commit_locked_index(lock_file);
201
Junio C Hamanoaecbf912007-08-31 13:13:42 -0700202 rollback_lock_file(lock_file);
203}
204
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700205static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv)
206{
207 int result;
208 unsigned int options = 0;
209
210 while (1 < argc && argv[1][0] == '-') {
211 if (!strcmp(argv[1], "--base"))
212 revs->max_count = 1;
213 else if (!strcmp(argv[1], "--ours"))
214 revs->max_count = 2;
215 else if (!strcmp(argv[1], "--theirs"))
216 revs->max_count = 3;
217 else if (!strcmp(argv[1], "-q"))
218 options |= DIFF_SILENT_ON_REMOVED;
219 else
220 return error("invalid option: %s", argv[1]);
221 argv++; argc--;
222 }
223
224 if (revs->max_count == -1 &&
225 (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
226 revs->combine_merges = revs->dense_combined_merges = 1;
227
228 if (read_cache() < 0) {
229 perror("read_cache");
230 return -1;
231 }
232 result = run_diff_files(revs, options);
233 return diff_result_code(&revs->diffopt, result);
234}
235
Linus Torvaldsa633fca2006-07-28 22:44:25 -0700236int cmd_diff(int argc, const char **argv, const char *prefix)
Junio C Hamano65056022006-04-28 23:20:52 -0700237{
Linus Torvalds1f1e8952006-06-19 17:42:35 -0700238 int i;
Junio C Hamano65056022006-04-28 23:20:52 -0700239 struct rev_info rev;
Linus Torvalds1f1e8952006-06-19 17:42:35 -0700240 struct object_array_entry ent[100];
Junio C Hamano65056022006-04-28 23:20:52 -0700241 int ents = 0, blobs = 0, paths = 0;
Linus Torvaldsa633fca2006-07-28 22:44:25 -0700242 const char *path = NULL;
Junio C Hamano65056022006-04-28 23:20:52 -0700243 struct blobinfo blob[2];
SZEDER GĂ¡boraf05d672008-03-25 22:06:26 +0100244 int nongit;
Alex Riesen41bbf9d2007-03-14 01:17:04 +0100245 int result = 0;
Junio C Hamano65056022006-04-28 23:20:52 -0700246
247 /*
248 * We could get N tree-ish in the rev.pending_objects list.
249 * Also there could be M blobs there, and P pathspecs.
250 *
251 * N=0, M=0:
252 * cache vs files (diff-files)
253 * N=0, M=2:
254 * compare two random blobs. P must be zero.
255 * N=0, M=1, P=1:
256 * compare a blob with a working tree file.
257 *
258 * N=1, M=0:
259 * tree vs cache (diff-index --cached)
260 *
261 * N=2, M=0:
262 * tree vs tree (diff-tree)
263 *
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700264 * N=0, M=0, P=2:
265 * compare two filesystem entities (aka --no-index).
266 *
Junio C Hamano65056022006-04-28 23:20:52 -0700267 * Other cases are errors.
268 */
Junio C Hamano230f5442006-05-03 23:54:34 -0700269
Johannes Schindelind516c2d2007-02-22 21:50:10 +0100270 prefix = setup_git_directory_gently(&nongit);
Johannes Schindelinef90d6d2008-05-14 18:46:53 +0100271 git_config(git_diff_ui_config, NULL);
Matthias Kestenholz6b2f2d92008-02-18 08:26:03 +0100272
273 if (diff_use_color_default == -1)
274 diff_use_color_default = git_use_color_default;
275
Linus Torvaldsdb6296a2006-07-28 21:21:48 -0700276 init_revisions(&rev, prefix);
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700277
278 /* If this is a no-index diff, just run it and exit there. */
279 diff_no_index(&rev, argc, argv, nongit, prefix);
280
281 /* Otherwise, we are doing the usual "git" diff */
Junio C Hamanoaecbf912007-08-31 13:13:42 -0700282 rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
Junio C Hamano65056022006-04-28 23:20:52 -0700283
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700284 if (nongit)
285 die("Not a git repository");
286 argc = setup_revisions(argc, argv, &rev, NULL);
Junio C Hamano047fbe92006-07-01 22:15:40 -0700287 if (!rev.diffopt.output_format) {
Timo Hirvonenc9b5ef92006-06-24 20:24:14 +0300288 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
Junio C Hamano72ee96c2006-08-09 12:45:27 -0700289 if (diff_setup_done(&rev.diffopt) < 0)
290 die("diff_setup_done failed");
Junio C Hamano047fbe92006-07-01 22:15:40 -0700291 }
Pierre Habouzit8f67f8a2007-11-10 20:05:14 +0100292 DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL);
293 DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
Timo Hirvonenc9b5ef92006-06-24 20:24:14 +0300294
Junio C Hamanoda31b352007-12-13 23:40:27 -0800295 /*
296 * If the user asked for our exit code then don't start a
René Scharfe89d07f72007-08-12 19:46:55 +0200297 * pager or we would end up reporting its exit code instead.
298 */
Junio C Hamanoda31b352007-12-13 23:40:27 -0800299 if (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS))
René Scharfe89d07f72007-08-12 19:46:55 +0200300 setup_pager();
301
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700302 /*
303 * Do we have --cached and not have a pending object, then
Junio C Hamano65056022006-04-28 23:20:52 -0700304 * default to HEAD by hand. Eek.
305 */
Linus Torvalds1f1e8952006-06-19 17:42:35 -0700306 if (!rev.pending.nr) {
Junio C Hamano65056022006-04-28 23:20:52 -0700307 int i;
308 for (i = 1; i < argc; i++) {
309 const char *arg = argv[i];
310 if (!strcmp(arg, "--"))
311 break;
312 else if (!strcmp(arg, "--cached")) {
Junio C Hamano3384a2d2007-12-11 10:09:04 -0800313 add_head_to_pending(&rev);
Junio C Hamano6c09c452007-02-24 22:26:33 -0800314 if (!rev.pending.nr)
315 die("No HEAD commit to compare with (yet)");
Junio C Hamano65056022006-04-28 23:20:52 -0700316 break;
317 }
318 }
319 }
320
Linus Torvalds1f1e8952006-06-19 17:42:35 -0700321 for (i = 0; i < rev.pending.nr; i++) {
322 struct object_array_entry *list = rev.pending.objects+i;
Junio C Hamano65056022006-04-28 23:20:52 -0700323 struct object *obj = list->item;
324 const char *name = list->name;
325 int flags = (obj->flags & UNINTERESTING);
326 if (!obj->parsed)
327 obj = parse_object(obj->sha1);
328 obj = deref_tag(obj, NULL, 0);
329 if (!obj)
330 die("invalid object '%s' given.", name);
Linus Torvalds19746322006-07-11 20:45:31 -0700331 if (obj->type == OBJ_COMMIT)
Junio C Hamano65056022006-04-28 23:20:52 -0700332 obj = &((struct commit *)obj)->tree->object;
Linus Torvalds19746322006-07-11 20:45:31 -0700333 if (obj->type == OBJ_TREE) {
Junio C Hamano0fe7c1d2006-04-29 01:24:49 -0700334 if (ARRAY_SIZE(ent) <= ents)
335 die("more than %d trees given: '%s'",
Junio C Hamano334b5062006-04-30 00:26:41 -0700336 (int) ARRAY_SIZE(ent), name);
Junio C Hamano65056022006-04-28 23:20:52 -0700337 obj->flags |= flags;
338 ent[ents].item = obj;
339 ent[ents].name = name;
340 ents++;
341 continue;
342 }
Linus Torvalds19746322006-07-11 20:45:31 -0700343 if (obj->type == OBJ_BLOB) {
Junio C Hamano65056022006-04-28 23:20:52 -0700344 if (2 <= blobs)
345 die("more than two blobs given: '%s'", name);
Shawn Pearcee7024962006-08-23 02:49:00 -0400346 hashcpy(blob[blobs].sha1, obj->sha1);
Junio C Hamano65056022006-04-28 23:20:52 -0700347 blob[blobs].name = name;
Martin Koegler01618a32007-04-22 18:44:00 +0200348 blob[blobs].mode = list->mode;
Junio C Hamano65056022006-04-28 23:20:52 -0700349 blobs++;
350 continue;
Junio C Hamano230f5442006-05-03 23:54:34 -0700351
Junio C Hamano65056022006-04-28 23:20:52 -0700352 }
353 die("unhandled object '%s' given.", name);
354 }
355 if (rev.prune_data) {
356 const char **pathspec = rev.prune_data;
357 while (*pathspec) {
358 if (!path)
359 path = *pathspec;
360 paths++;
361 pathspec++;
362 }
363 }
364
365 /*
366 * Now, do the arguments look reasonable?
367 */
368 if (!ents) {
369 switch (blobs) {
370 case 0:
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700371 result = builtin_diff_files(&rev, argc, argv);
Junio C Hamano65056022006-04-28 23:20:52 -0700372 break;
373 case 1:
374 if (paths != 1)
375 usage(builtin_diff_usage);
Alex Riesen41bbf9d2007-03-14 01:17:04 +0100376 result = builtin_diff_b_f(&rev, argc, argv, blob, path);
Junio C Hamano65056022006-04-28 23:20:52 -0700377 break;
378 case 2:
Junio C Hamano0fe7c1d2006-04-29 01:24:49 -0700379 if (paths)
380 usage(builtin_diff_usage);
Alex Riesen41bbf9d2007-03-14 01:17:04 +0100381 result = builtin_diff_blobs(&rev, argc, argv, blob);
Junio C Hamano65056022006-04-28 23:20:52 -0700382 break;
383 default:
384 usage(builtin_diff_usage);
385 }
386 }
387 else if (blobs)
388 usage(builtin_diff_usage);
389 else if (ents == 1)
Alex Riesen41bbf9d2007-03-14 01:17:04 +0100390 result = builtin_diff_index(&rev, argc, argv);
Junio C Hamano65056022006-04-28 23:20:52 -0700391 else if (ents == 2)
Alex Riesen41bbf9d2007-03-14 01:17:04 +0100392 result = builtin_diff_tree(&rev, argc, argv, ent);
Junio C Hamano9919f412006-07-17 00:34:44 -0700393 else if ((ents == 3) && (ent[0].item->flags & UNINTERESTING)) {
394 /* diff A...B where there is one sane merge base between
395 * A and B. We have ent[0] == merge-base, ent[1] == A,
396 * and ent[2] == B. Show diff between the base and B.
397 */
Junio C Hamano306ea2d2006-08-10 00:50:15 -0700398 ent[1] = ent[2];
Alex Riesen41bbf9d2007-03-14 01:17:04 +0100399 result = builtin_diff_tree(&rev, argc, argv, ent);
Junio C Hamano9919f412006-07-17 00:34:44 -0700400 }
Junio C Hamano0fe7c1d2006-04-29 01:24:49 -0700401 else
Alex Riesen41bbf9d2007-03-14 01:17:04 +0100402 result = builtin_diff_combined(&rev, argc, argv,
Junio C Hamano9919f412006-07-17 00:34:44 -0700403 ent, ents);
Junio C Hamanoda31b352007-12-13 23:40:27 -0800404 result = diff_result_code(&rev.diffopt, result);
Junio C Hamanoaecbf912007-08-31 13:13:42 -0700405 if (1 < rev.diffopt.skip_stat_unmatch)
406 refresh_index_quietly();
Alex Riesen41bbf9d2007-03-14 01:17:04 +0100407 return result;
Junio C Hamano65056022006-04-28 23:20:52 -0700408}