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