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"
1516
struct blobinfo {
17unsigned char sha1[20];
18const char *name;
19unsigned mode;
20};
2122
static const char builtin_diff_usage[] =
23"git-diff <options> <rev>{0,2} -- <path>*";
2425
static void stuff_change(struct diff_options *opt,
26unsigned old_mode, unsigned new_mode,
27const unsigned char *old_sha1,
28const unsigned char *new_sha1,
29const char *old_name,
30const char *new_name)
31{
32struct diff_filespec *one, *two;
3334
if (!is_null_sha1(old_sha1) && !is_null_sha1(new_sha1) &&
35!hashcmp(old_sha1, new_sha1) && (old_mode == new_mode))
36return;
3738
if (opt->reverse_diff) {
39unsigned tmp;
40const unsigned char *tmp_u;
41const char *tmp_c;
42tmp = old_mode; old_mode = new_mode; new_mode = tmp;
43tmp_u = old_sha1; old_sha1 = new_sha1; new_sha1 = tmp_u;
44tmp_c = old_name; old_name = new_name; new_name = tmp_c;
45}
46one = alloc_filespec(old_name);
47two = alloc_filespec(new_name);
48fill_filespec(one, old_sha1, old_mode);
49fill_filespec(two, new_sha1, new_mode);
5051
/* NEEDSWORK: shouldn't this part of diffopt??? */
52diff_queue(&diff_queued_diff, one, two);
53}
5455
static int builtin_diff_b_f(struct rev_info *revs,
56int argc, const char **argv,
57struct blobinfo *blob,
58const char *path)
59{
60/* Blob vs file in the working tree*/
61struct stat st;
6263
if (argc > 1)
64usage(builtin_diff_usage);
6566
if (lstat(path, &st))
67die("'%s': %s", path, strerror(errno));
68if (!(S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)))
69die("'%s': not a regular file or symlink", path);
7071
if (blob[0].mode == S_IFINVALID)
72blob[0].mode = canon_mode(st.st_mode);
7374
stuff_change(&revs->diffopt,
75blob[0].mode, canon_mode(st.st_mode),
76blob[0].sha1, null_sha1,
77path, path);
78diffcore_std(&revs->diffopt);
79diff_flush(&revs->diffopt);
80return 0;
81}
8283
static int builtin_diff_blobs(struct rev_info *revs,
84int argc, const char **argv,
85struct blobinfo *blob)
86{
87unsigned mode = canon_mode(S_IFREG | 0644);
8889
if (argc > 1)
90usage(builtin_diff_usage);
9192
if (blob[0].mode == S_IFINVALID)
93blob[0].mode = mode;
9495
if (blob[1].mode == S_IFINVALID)
96blob[1].mode = mode;
9798
stuff_change(&revs->diffopt,
99blob[0].mode, blob[1].mode,
100blob[0].sha1, blob[1].sha1,
101blob[0].name, blob[1].name);
102diffcore_std(&revs->diffopt);
103diff_flush(&revs->diffopt);
104return 0;
105}
106107
static int builtin_diff_index(struct rev_info *revs,
108int argc, const char **argv)
109{
110int cached = 0;
111while (1 < argc) {
112const char *arg = argv[1];
113if (!strcmp(arg, "--cached"))
114cached = 1;
115else
116usage(builtin_diff_usage);
117argv++; argc--;
118}
119/*
120* Make sure there is one revision (i.e. pending object),
121* and there is no revision filtering parameters.
122*/
123if (revs->pending.nr != 1 ||
124revs->max_count != -1 || revs->min_age != -1 ||
125revs->max_age != -1)
126usage(builtin_diff_usage);
127if (read_cache() < 0) {
128perror("read_cache");
129return -1;
130}
131return run_diff_index(revs, cached);
132}
133134
static int builtin_diff_tree(struct rev_info *revs,
135int argc, const char **argv,
136struct object_array_entry *ent)
137{
138const unsigned char *(sha1[2]);
139int swap = 0;
140141
if (argc > 1)
142usage(builtin_diff_usage);
143144
/* We saw two trees, ent[0] and ent[1].
145* if ent[1] is uninteresting, they are swapped
146*/
147if (ent[1].item->flags & UNINTERESTING)
148swap = 1;
149sha1[swap] = ent[0].item->sha1;
150sha1[1-swap] = ent[1].item->sha1;
151diff_tree_sha1(sha1[0], sha1[1], "", &revs->diffopt);
152log_tree_diff_flush(revs);
153return 0;
154}
155156
static int builtin_diff_combined(struct rev_info *revs,
157int argc, const char **argv,
158struct object_array_entry *ent,
159int ents)
160{
161const unsigned char (*parent)[20];
162int i;
163164
if (argc > 1)
165usage(builtin_diff_usage);
166167
if (!revs->dense_combined_merges && !revs->combine_merges)
168revs->dense_combined_merges = revs->combine_merges = 1;
169parent = xmalloc(ents * sizeof(*parent));
170/* Again, the revs are all reverse */
171for (i = 0; i < ents; i++)
172hashcpy((unsigned char *)(parent + i),
173ent[ents - 1 - i].item->sha1);
174diff_tree_combined(parent[0], parent + 1, ents - 1,
175revs->dense_combined_merges, revs);
176return 0;
177}
178179
void add_head(struct rev_info *revs)
180{
181unsigned char sha1[20];
182struct object *obj;
183if (get_sha1("HEAD", sha1))
184return;
185obj = parse_object(sha1);
186if (!obj)
187return;
188add_pending_object(revs, obj, "HEAD");
189}
190191
static void refresh_index_quietly(void)
192{
193struct lock_file *lock_file;
194int fd;
195196
lock_file = xcalloc(1, sizeof(struct lock_file));
197fd = hold_locked_index(lock_file, 0);
198if (fd < 0)
199return;
200discard_cache();
201read_cache();
202refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED);
203if (active_cache_changed) {
204if (write_cache(fd, active_cache, active_nr) ||
205close(fd) ||
206commit_locked_index(lock_file))
207; /*
208* silently ignore it -- we haven't mucked
209* with the real index.
210*/
211}
212rollback_lock_file(lock_file);
213}
214215
int cmd_diff(int argc, const char **argv, const char *prefix)
216{
217int i;
218struct rev_info rev;
219struct object_array_entry ent[100];
220int ents = 0, blobs = 0, paths = 0;
221const char *path = NULL;
222struct blobinfo blob[2];
223int nongit = 0;
224int result = 0;
225226
/*
227* We could get N tree-ish in the rev.pending_objects list.
228* Also there could be M blobs there, and P pathspecs.
229*
230* N=0, M=0:
231* cache vs files (diff-files)
232* N=0, M=2:
233* compare two random blobs. P must be zero.
234* N=0, M=1, P=1:
235* compare a blob with a working tree file.
236*
237* N=1, M=0:
238* tree vs cache (diff-index --cached)
239*
240* N=2, M=0:
241* tree vs tree (diff-tree)
242*
243* Other cases are errors.
244*/
245246
prefix = setup_git_directory_gently(&nongit);
247git_config(git_diff_ui_config);
248init_revisions(&rev, prefix);
249rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
250251
if (!setup_diff_no_index(&rev, argc, argv, nongit, prefix))
252argc = 0;
253else
254argc = setup_revisions(argc, argv, &rev, NULL);
255if (!rev.diffopt.output_format) {
256rev.diffopt.output_format = DIFF_FORMAT_PATCH;
257if (diff_setup_done(&rev.diffopt) < 0)
258die("diff_setup_done failed");
259}
260rev.diffopt.allow_external = 1;
261rev.diffopt.recursive = 1;
262263
/* If the user asked for our exit code then don't start a
264* pager or we would end up reporting its exit code instead.
265*/
266if (!rev.diffopt.exit_with_status)
267setup_pager();
268269
/* Do we have --cached and not have a pending object, then
270* default to HEAD by hand. Eek.
271*/
272if (!rev.pending.nr) {
273int i;
274for (i = 1; i < argc; i++) {
275const char *arg = argv[i];
276if (!strcmp(arg, "--"))
277break;
278else if (!strcmp(arg, "--cached")) {
279add_head(&rev);
280if (!rev.pending.nr)
281die("No HEAD commit to compare with (yet)");
282break;
283}
284}
285}
286287
for (i = 0; i < rev.pending.nr; i++) {
288struct object_array_entry *list = rev.pending.objects+i;
289struct object *obj = list->item;
290const char *name = list->name;
291int flags = (obj->flags & UNINTERESTING);
292if (!obj->parsed)
293obj = parse_object(obj->sha1);
294obj = deref_tag(obj, NULL, 0);
295if (!obj)
296die("invalid object '%s' given.", name);
297if (obj->type == OBJ_COMMIT)
298obj = &((struct commit *)obj)->tree->object;
299if (obj->type == OBJ_TREE) {
300if (ARRAY_SIZE(ent) <= ents)
301die("more than %d trees given: '%s'",
302(int) ARRAY_SIZE(ent), name);
303obj->flags |= flags;
304ent[ents].item = obj;
305ent[ents].name = name;
306ents++;
307continue;
308}
309if (obj->type == OBJ_BLOB) {
310if (2 <= blobs)
311die("more than two blobs given: '%s'", name);
312hashcpy(blob[blobs].sha1, obj->sha1);
313blob[blobs].name = name;
314blob[blobs].mode = list->mode;
315blobs++;
316continue;
317318
}
319die("unhandled object '%s' given.", name);
320}
321if (rev.prune_data) {
322const char **pathspec = rev.prune_data;
323while (*pathspec) {
324if (!path)
325path = *pathspec;
326paths++;
327pathspec++;
328}
329}
330331
/*
332* Now, do the arguments look reasonable?
333*/
334if (!ents) {
335switch (blobs) {
336case 0:
337result = run_diff_files_cmd(&rev, argc, argv);
338break;
339case 1:
340if (paths != 1)
341usage(builtin_diff_usage);
342result = builtin_diff_b_f(&rev, argc, argv, blob, path);
343break;
344case 2:
345if (paths)
346usage(builtin_diff_usage);
347result = builtin_diff_blobs(&rev, argc, argv, blob);
348break;
349default:
350usage(builtin_diff_usage);
351}
352}
353else if (blobs)
354usage(builtin_diff_usage);
355else if (ents == 1)
356result = builtin_diff_index(&rev, argc, argv);
357else if (ents == 2)
358result = builtin_diff_tree(&rev, argc, argv, ent);
359else if ((ents == 3) && (ent[0].item->flags & UNINTERESTING)) {
360/* diff A...B where there is one sane merge base between
361* A and B. We have ent[0] == merge-base, ent[1] == A,
362* and ent[2] == B. Show diff between the base and B.
363*/
364ent[1] = ent[2];
365result = builtin_diff_tree(&rev, argc, argv, ent);
366}
367else
368result = builtin_diff_combined(&rev, argc, argv,
369ent, ents);
370if (rev.diffopt.exit_with_status)
371result = rev.diffopt.has_changes;
372373
if (1 < rev.diffopt.skip_stat_unmatch)
374refresh_index_quietly();
375return result;
376}