1#include "cache.h"
2#include "diff.h"
3static int cached_only = 0;
5static int diff_output_format = DIFF_FORMAT_HUMAN;
6static int match_nonexisting = 0;
7static int detect_rename = 0;
8static int reverse_diff = 0;
9static int diff_score_opt = 0;
10static const char *pickaxe = NULL;
11/* A file entry went away or appeared */
13static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
14{
15 diff_addremove(prefix[0], ntohl(mode), sha1, ce->name, NULL);
16}
17static int get_stat_data(struct cache_entry *ce, unsigned char **sha1p, unsigned int *modep)
19{
20 unsigned char *sha1 = ce->sha1;
21 unsigned int mode = ce->ce_mode;
22 if (!cached_only) {
24 static unsigned char no_sha1[20];
25 int changed;
26 struct stat st;
27 if (lstat(ce->name, &st) < 0) {
28 if (errno == ENOENT && match_nonexisting) {
29 *sha1p = sha1;
30 *modep = mode;
31 return 0;
32 }
33 return -1;
34 }
35 changed = ce_match_stat(ce, &st);
36 if (changed) {
37 mode = create_ce_mode(st.st_mode);
38 sha1 = no_sha1;
39 }
40 }
41 *sha1p = sha1;
43 *modep = mode;
44 return 0;
45}
46static void show_new_file(struct cache_entry *new)
48{
49 unsigned char *sha1;
50 unsigned int mode;
51 /* New file in the index: it might actually be different in the working copy */
53 if (get_stat_data(new, &sha1, &mode) < 0)
54 return;
55 show_file("+", new, sha1, mode);
57}
58static int show_modified(struct cache_entry *old,
60 struct cache_entry *new,
61 int report_missing)
62{
63 unsigned int mode, oldmode;
64 unsigned char *sha1;
65 if (get_stat_data(new, &sha1, &mode) < 0) {
67 if (report_missing)
68 show_file("-", old, old->sha1, old->ce_mode);
69 return -1;
70 }
71 oldmode = old->ce_mode;
73 if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
74 detect_rename < DIFF_DETECT_COPY)
75 return 0;
76 mode = ntohl(mode);
78 oldmode = ntohl(oldmode);
79 diff_change(oldmode, mode,
81 old->sha1, sha1, old->name, NULL);
82 return 0;
83}
84static int diff_cache(struct cache_entry **ac, int entries)
86{
87 while (entries) {
88 struct cache_entry *ce = *ac;
89 int same = (entries > 1) && ce_same_name(ce, ac[1]);
90 switch (ce_stage(ce)) {
92 case 0:
93 /* No stage 1 entry? That means it's a new file */
94 if (!same) {
95 show_new_file(ce);
96 break;
97 }
98 /* Show difference between old and new */
99 show_modified(ac[1], ce, 1);
100 break;
101 case 1:
102 /* No stage 3 (merge) entry? That means it's been deleted */
103 if (!same) {
104 show_file("-", ce, ce->sha1, ce->ce_mode);
105 break;
106 }
107 /* We come here with ce pointing at stage 1
108 * (original tree) and ac[1] pointing at stage
109 * 3 (unmerged). show-modified with
110 * report-mising set to false does not say the
111 * file is deleted but reports true if work
112 * tree does not have it, in which case we
113 * fall through to report the unmerged state.
114 * Otherwise, we show the differences between
115 * the original tree and the work tree.
116 */
117 if (!cached_only && !show_modified(ce, ac[1], 0))
118 break;
119 /* fallthru */
120 case 3:
121 diff_unmerge(ce->name);
122 break;
123 default:
125 die("impossible cache entry stage");
126 }
127 /*
129 * Ignore all the different stages for this file,
130 * we've handled the relevant cases now.
131 */
132 do {
133 ac++;
134 entries--;
135 } while (entries && ce_same_name(ce, ac[0]));
136 }
137 return 0;
138}
139/*
141 * This turns all merge entries into "stage 3". That guarantees that
142 * when we read in the new tree (into "stage 1"), we won't lose sight
143 * of the fact that we had unmerged entries.
144 */
145static void mark_merge_entries(void)
146{
147 int i;
148 for (i = 0; i < active_nr; i++) {
149 struct cache_entry *ce = active_cache[i];
150 if (!ce_stage(ce))
151 continue;
152 ce->ce_flags |= htons(CE_STAGEMASK);
153 }
154}
155static char *diff_cache_usage =
157"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish> [<path>...]";
158int main(int argc, const char **argv)
160{
161 const char *tree_name = NULL;
162 unsigned char sha1[20];
163 const char **pathspec = NULL;
164 void *tree;
165 unsigned long size;
166 int ret;
167 int i;
168 read_cache();
170 for (i = 1; i < argc; i++) {
171 const char *arg = argv[i];
172 if (*arg != '-') {
174 if (tree_name) {
175 pathspec = argv + i;
176 break;
177 }
178 tree_name = arg;
179 continue;
180 }
181
182 if (!strcmp(arg, "-r")) {
183 /* We accept the -r flag just to look like git-diff-tree */
184 continue;
185 }
186 if (!strcmp(arg, "-p")) {
187 diff_output_format = DIFF_FORMAT_PATCH;
188 continue;
189 }
190 if (!strncmp(arg, "-M", 2)) {
191 detect_rename = DIFF_DETECT_RENAME;
192 diff_score_opt = diff_scoreopt_parse(arg);
193 continue;
194 }
195 if (!strncmp(arg, "-C", 2)) {
196 detect_rename = DIFF_DETECT_COPY;
197 diff_score_opt = diff_scoreopt_parse(arg);
198 continue;
199 }
200 if (!strcmp(arg, "-z")) {
201 diff_output_format = DIFF_FORMAT_MACHINE;
202 continue;
203 }
204 if (!strcmp(arg, "-R")) {
205 reverse_diff = 1;
206 continue;
207 }
208 if (!strcmp(arg, "-S")) {
209 pickaxe = arg + 2;
210 continue;
211 }
212 if (!strcmp(arg, "-m")) {
213 match_nonexisting = 1;
214 continue;
215 }
216 if (!strcmp(arg, "--cached")) {
217 cached_only = 1;
218 continue;
219 }
220 usage(diff_cache_usage);
221 }
222 if (!tree_name || get_sha1(tree_name, sha1))
224 usage(diff_cache_usage);
225 /* The rest is for paths restriction. */
227 diff_setup(reverse_diff);
228 mark_merge_entries();
230 tree = read_object_with_reference(sha1, "tree", &size, NULL);
232 if (!tree)
233 die("bad tree object %s", tree_name);
234 if (read_tree(tree, size, 1))
235 die("unable to read tree object %s", tree_name);
236 ret = diff_cache(active_cache, active_nr);
238 if (detect_rename)
239 diffcore_rename(detect_rename, diff_score_opt);
240 if (pickaxe)
241 diffcore_pickaxe(pickaxe);
242 if (pathspec)
243 diffcore_pathspec(pathspec);
244 diff_flush(diff_output_format, 1);
245 return ret;
246}