Merge branch 'np/types'
[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"
7#include "commit.h"
8#include "blob.h"
9#include "tag.h"
10#include "diff.h"
11#include "diffcore.h"
12#include "revision.h"
13#include "log-tree.h"
14#include "builtin.h"
15
16/* NEEDSWORK: struct object has place for name but we _do_
17 * know mode when we extracted the blob out of a tree, which
18 * we currently lose.
19 */
20struct blobinfo {
21 unsigned char sha1[20];
22 const char *name;
23};
24
25static const char builtin_diff_usage[] =
15e593e4 26"git-diff <options> <rev>{0,2} -- <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,
32 const char *old_name,
33 const char *new_name)
34{
35 struct diff_filespec *one, *two;
36
0bef57ee 37 if (!is_null_sha1(old_sha1) && !is_null_sha1(new_sha1) &&
a89fccd2 38 !hashcmp(old_sha1, new_sha1))
65056021
JH
39 return;
40
41 if (opt->reverse_diff) {
42 unsigned tmp;
d92f1dc6 43 const unsigned char *tmp_u;
65056021
JH
44 const char *tmp_c;
45 tmp = old_mode; old_mode = new_mode; new_mode = tmp;
46 tmp_u = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_u;
47 tmp_c = old_name; old_name = new_name; new_name = tmp_c;
48 }
49 one = alloc_filespec(old_name);
50 two = alloc_filespec(new_name);
51 fill_filespec(one, old_sha1, old_mode);
52 fill_filespec(two, new_sha1, new_mode);
53
54 /* NEEDSWORK: shouldn't this part of diffopt??? */
55 diff_queue(&diff_queued_diff, one, two);
56}
57
58static int builtin_diff_b_f(struct rev_info *revs,
59 int argc, const char **argv,
60 struct blobinfo *blob,
61 const char *path)
62{
63 /* Blob vs file in the working tree*/
64 struct stat st;
65
a610786f
TH
66 if (argc > 1)
67 usage(builtin_diff_usage);
68
65056021
JH
69 if (lstat(path, &st))
70 die("'%s': %s", path, strerror(errno));
71 if (!(S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)))
72 die("'%s': not a regular file or symlink", path);
73 stuff_change(&revs->diffopt,
74 canon_mode(st.st_mode), canon_mode(st.st_mode),
75 blob[0].sha1, null_sha1,
065e0b12 76 path, path);
65056021
JH
77 diffcore_std(&revs->diffopt);
78 diff_flush(&revs->diffopt);
79 return 0;
80}
81
82static int builtin_diff_blobs(struct rev_info *revs,
83 int argc, const char **argv,
84 struct blobinfo *blob)
85{
65056021
JH
86 unsigned mode = canon_mode(S_IFREG | 0644);
87
a610786f
TH
88 if (argc > 1)
89 usage(builtin_diff_usage);
90
65056021
JH
91 stuff_change(&revs->diffopt,
92 mode, mode,
f82cd3c6 93 blob[0].sha1, blob[1].sha1,
53dd8a9c 94 blob[0].name, blob[1].name);
65056021
JH
95 diffcore_std(&revs->diffopt);
96 diff_flush(&revs->diffopt);
97 return 0;
98}
99
100static int builtin_diff_index(struct rev_info *revs,
101 int argc, const char **argv)
102{
103 int cached = 0;
104 while (1 < argc) {
105 const char *arg = argv[1];
f2dd1c9a 106 if (!strcmp(arg, "--cached"))
65056021 107 cached = 1;
65056021
JH
108 else
109 usage(builtin_diff_usage);
110 argv++; argc--;
111 }
112 /*
113 * Make sure there is one revision (i.e. pending object),
114 * and there is no revision filtering parameters.
115 */
1f1e895f 116 if (revs->pending.nr != 1 ||
65056021
JH
117 revs->max_count != -1 || revs->min_age != -1 ||
118 revs->max_age != -1)
119 usage(builtin_diff_usage);
b4e1e4a7
JH
120 if (read_cache() < 0) {
121 perror("read_cache");
122 return -1;
123 }
65056021
JH
124 return run_diff_index(revs, cached);
125}
126
127static int builtin_diff_tree(struct rev_info *revs,
128 int argc, const char **argv,
1f1e895f 129 struct object_array_entry *ent)
65056021 130{
65056021 131 const unsigned char *(sha1[2]);
1f1e895f 132 int swap = 0;
a610786f
TH
133
134 if (argc > 1)
135 usage(builtin_diff_usage);
0fe7c1de
JH
136
137 /* We saw two trees, ent[0] and ent[1].
82e5a82f 138 * if ent[1] is uninteresting, they are swapped
0fe7c1de 139 */
1f1e895f
LT
140 if (ent[1].item->flags & UNINTERESTING)
141 swap = 1;
65056021
JH
142 sha1[swap] = ent[0].item->sha1;
143 sha1[1-swap] = ent[1].item->sha1;
144 diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt);
145 log_tree_diff_flush(revs);
146 return 0;
147}
148
0fe7c1de
JH
149static int builtin_diff_combined(struct rev_info *revs,
150 int argc, const char **argv,
1f1e895f 151 struct object_array_entry *ent,
0fe7c1de
JH
152 int ents)
153{
154 const unsigned char (*parent)[20];
155 int i;
156
a610786f
TH
157 if (argc > 1)
158 usage(builtin_diff_usage);
159
0fe7c1de
JH
160 if (!revs->dense_combined_merges && !revs->combine_merges)
161 revs->dense_combined_merges = revs->combine_merges = 1;
162 parent = xmalloc(ents * sizeof(*parent));
163 /* Again, the revs are all reverse */
164 for (i = 0; i < ents; i++)
75b62b48
JS
165 hashcpy((unsigned char *)(parent + i),
166 ent[ents - 1 - i].item->sha1);
0fe7c1de
JH
167 diff_tree_combined(parent[0], parent + 1, ents - 1,
168 revs->dense_combined_merges, revs);
169 return 0;
170}
171
e686eb98 172void add_head(struct rev_info *revs)
65056021
JH
173{
174 unsigned char sha1[20];
175 struct object *obj;
176 if (get_sha1("HEAD", sha1))
177 return;
178 obj = parse_object(sha1);
179 if (!obj)
180 return;
1f1e895f 181 add_pending_object(revs, obj, "HEAD");
65056021
JH
182}
183
a633fca0 184int cmd_diff(int argc, const char **argv, const char *prefix)
65056021 185{
1f1e895f 186 int i;
65056021 187 struct rev_info rev;
1f1e895f 188 struct object_array_entry ent[100];
65056021 189 int ents = 0, blobs = 0, paths = 0;
a633fca0 190 const char *path = NULL;
65056021 191 struct blobinfo blob[2];
d516c2d1 192 int nongit = 0;
65056021
JH
193
194 /*
195 * We could get N tree-ish in the rev.pending_objects list.
196 * Also there could be M blobs there, and P pathspecs.
197 *
198 * N=0, M=0:
199 * cache vs files (diff-files)
200 * N=0, M=2:
201 * compare two random blobs. P must be zero.
202 * N=0, M=1, P=1:
203 * compare a blob with a working tree file.
204 *
205 * N=1, M=0:
206 * tree vs cache (diff-index --cached)
207 *
208 * N=2, M=0:
209 * tree vs tree (diff-tree)
210 *
211 * Other cases are errors.
212 */
230f544e 213
d516c2d1 214 prefix = setup_git_directory_gently(&nongit);
ef1d9c5a 215 git_config(git_diff_ui_config);
db6296a5 216 init_revisions(&rev, prefix);
65056021
JH
217
218 argc = setup_revisions(argc, argv, &rev, NULL);
047fbe90 219 if (!rev.diffopt.output_format) {
c9b5ef99 220 rev.diffopt.output_format = DIFF_FORMAT_PATCH;
72ee96c0
JH
221 if (diff_setup_done(&rev.diffopt) < 0)
222 die("diff_setup_done failed");
047fbe90 223 }
c9b5ef99 224
65056021
JH
225 /* Do we have --cached and not have a pending object, then
226 * default to HEAD by hand. Eek.
227 */
1f1e895f 228 if (!rev.pending.nr) {
65056021
JH
229 int i;
230 for (i = 1; i < argc; i++) {
231 const char *arg = argv[i];
232 if (!strcmp(arg, "--"))
233 break;
234 else if (!strcmp(arg, "--cached")) {
235 add_head(&rev);
6c09c451
JH
236 if (!rev.pending.nr)
237 die("No HEAD commit to compare with (yet)");
65056021
JH
238 break;
239 }
240 }
241 }
242
1f1e895f
LT
243 for (i = 0; i < rev.pending.nr; i++) {
244 struct object_array_entry *list = rev.pending.objects+i;
65056021
JH
245 struct object *obj = list->item;
246 const char *name = list->name;
247 int flags = (obj->flags & UNINTERESTING);
248 if (!obj->parsed)
249 obj = parse_object(obj->sha1);
250 obj = deref_tag(obj, NULL, 0);
251 if (!obj)
252 die("invalid object '%s' given.", name);
1974632c 253 if (obj->type == OBJ_COMMIT)
65056021 254 obj = &((struct commit *)obj)->tree->object;
1974632c 255 if (obj->type == OBJ_TREE) {
0fe7c1de
JH
256 if (ARRAY_SIZE(ent) <= ents)
257 die("more than %d trees given: '%s'",
334b506a 258 (int) ARRAY_SIZE(ent), name);
65056021
JH
259 obj->flags |= flags;
260 ent[ents].item = obj;
261 ent[ents].name = name;
262 ents++;
263 continue;
264 }
1974632c 265 if (obj->type == OBJ_BLOB) {
65056021
JH
266 if (2 <= blobs)
267 die("more than two blobs given: '%s'", name);
e702496e 268 hashcpy(blob[blobs].sha1, obj->sha1);
65056021
JH
269 blob[blobs].name = name;
270 blobs++;
271 continue;
230f544e 272
65056021
JH
273 }
274 die("unhandled object '%s' given.", name);
275 }
276 if (rev.prune_data) {
277 const char **pathspec = rev.prune_data;
278 while (*pathspec) {
279 if (!path)
280 path = *pathspec;
281 paths++;
282 pathspec++;
283 }
284 }
285
286 /*
287 * Now, do the arguments look reasonable?
288 */
289 if (!ents) {
290 switch (blobs) {
291 case 0:
d516c2d1 292 return run_diff_files_cmd(&rev, argc, argv);
65056021
JH
293 break;
294 case 1:
295 if (paths != 1)
296 usage(builtin_diff_usage);
297 return builtin_diff_b_f(&rev, argc, argv, blob, path);
298 break;
299 case 2:
0fe7c1de
JH
300 if (paths)
301 usage(builtin_diff_usage);
65056021
JH
302 return builtin_diff_blobs(&rev, argc, argv, blob);
303 break;
304 default:
305 usage(builtin_diff_usage);
306 }
307 }
308 else if (blobs)
309 usage(builtin_diff_usage);
310 else if (ents == 1)
311 return builtin_diff_index(&rev, argc, argv);
312 else if (ents == 2)
313 return builtin_diff_tree(&rev, argc, argv, ent);
9919f41c
JH
314 else if ((ents == 3) && (ent[0].item->flags & UNINTERESTING)) {
315 /* diff A...B where there is one sane merge base between
316 * A and B. We have ent[0] == merge-base, ent[1] == A,
317 * and ent[2] == B. Show diff between the base and B.
318 */
306ea2df 319 ent[1] = ent[2];
9919f41c
JH
320 return builtin_diff_tree(&rev, argc, argv, ent);
321 }
0fe7c1de 322 else
9919f41c
JH
323 return builtin_diff_combined(&rev, argc, argv,
324 ent, ents);
65056021
JH
325 usage(builtin_diff_usage);
326}