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 find_copies_harder = 0;
9static int diff_setup_opt = 0;
10static int diff_score_opt = 0;
11static const char *pickaxe = NULL;
12static int pickaxe_opts = 0;
13static int diff_break_opt = -1;
14static const char *orderfile = NULL;
15static const char *diff_filter = NULL;
16/* A file entry went away or appeared */
18static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
19{
20 diff_addremove(prefix[0], ntohl(mode), sha1, ce->name, NULL);
21}
22static int get_stat_data(struct cache_entry *ce, unsigned char **sha1p, unsigned int *modep)
24{
25 unsigned char *sha1 = ce->sha1;
26 unsigned int mode = ce->ce_mode;
27 if (!cached_only) {
29 static unsigned char no_sha1[20];
30 int changed;
31 struct stat st;
32 if (lstat(ce->name, &st) < 0) {
33 if (errno == ENOENT && match_nonexisting) {
34 *sha1p = sha1;
35 *modep = mode;
36 return 0;
37 }
38 return -1;
39 }
40 changed = ce_match_stat(ce, &st);
41 if (changed) {
42 mode = create_ce_mode(st.st_mode);
43 sha1 = no_sha1;
44 }
45 }
46 *sha1p = sha1;
48 *modep = mode;
49 return 0;
50}
51static void show_new_file(struct cache_entry *new)
53{
54 unsigned char *sha1;
55 unsigned int mode;
56 /* New file in the index: it might actually be different in the working copy */
58 if (get_stat_data(new, &sha1, &mode) < 0)
59 return;
60 show_file("+", new, sha1, mode);
62}
63static int show_modified(struct cache_entry *old,
65 struct cache_entry *new,
66 int report_missing)
67{
68 unsigned int mode, oldmode;
69 unsigned char *sha1;
70 if (get_stat_data(new, &sha1, &mode) < 0) {
72 if (report_missing)
73 show_file("-", old, old->sha1, old->ce_mode);
74 return -1;
75 }
76 oldmode = old->ce_mode;
78 if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
79 !find_copies_harder)
80 return 0;
81 mode = ntohl(mode);
83 oldmode = ntohl(oldmode);
84 diff_change(oldmode, mode,
86 old->sha1, sha1, old->name, NULL);
87 return 0;
88}
89static int diff_cache(struct cache_entry **ac, int entries, const char **pathspec)
91{
92 while (entries) {
93 struct cache_entry *ce = *ac;
94 int same = (entries > 1) && ce_same_name(ce, ac[1]);
95 if (!ce_path_match(ce, pathspec))
97 goto skip_entry;
98 switch (ce_stage(ce)) {
100 case 0:
101 /* No stage 1 entry? That means it's a new file */
102 if (!same) {
103 show_new_file(ce);
104 break;
105 }
106 /* Show difference between old and new */
107 show_modified(ac[1], ce, 1);
108 break;
109 case 1:
110 /* No stage 3 (merge) entry? That means it's been deleted */
111 if (!same) {
112 show_file("-", ce, ce->sha1, ce->ce_mode);
113 break;
114 }
115 /* We come here with ce pointing at stage 1
116 * (original tree) and ac[1] pointing at stage
117 * 3 (unmerged). show-modified with
118 * report-mising set to false does not say the
119 * file is deleted but reports true if work
120 * tree does not have it, in which case we
121 * fall through to report the unmerged state.
122 * Otherwise, we show the differences between
123 * the original tree and the work tree.
124 */
125 if (!cached_only && !show_modified(ce, ac[1], 0))
126 break;
127 /* fallthru */
128 case 3:
129 diff_unmerge(ce->name);
130 break;
131 default:
133 die("impossible cache entry stage");
134 }
135skip_entry:
137 /*
138 * Ignore all the different stages for this file,
139 * we've handled the relevant cases now.
140 */
141 do {
142 ac++;
143 entries--;
144 } while (entries && ce_same_name(ce, ac[0]));
145 }
146 return 0;
147}
148/*
150 * This turns all merge entries into "stage 3". That guarantees that
151 * when we read in the new tree (into "stage 1"), we won't lose sight
152 * of the fact that we had unmerged entries.
153 */
154static void mark_merge_entries(void)
155{
156 int i;
157 for (i = 0; i < active_nr; i++) {
158 struct cache_entry *ce = active_cache[i];
159 if (!ce_stage(ce))
160 continue;
161 ce->ce_flags |= htons(CE_STAGEMASK);
162 }
163}
164static char *diff_cache_usage =
166"git-diff-cache [-m] [--cached] "
167"[<common diff options>] <tree-ish> [<path>...]"
168COMMON_DIFF_OPTIONS_HELP;
169int main(int argc, const char **argv)
171{
172 const char *tree_name = NULL;
173 unsigned char sha1[20];
174 const char **pathspec = NULL;
175 void *tree;
176 unsigned long size;
177 int ret;
178 int allow_options = 1;
179 int i;
180 read_cache();
182 for (i = 1; i < argc; i++) {
183 const char *arg = argv[i];
184 if (!allow_options || *arg != '-') {
186 if (tree_name) {
187 pathspec = argv + i;
188 break;
189 }
190 tree_name = arg;
191 continue;
192 }
193
194 if (!strcmp(arg, "--")) {
195 allow_options = 0;
196 continue;
197 }
198 if (!strcmp(arg, "-r")) {
199 /* We accept the -r flag just to look like git-diff-tree */
200 continue;
201 }
202 /* We accept the -u flag as a synonym for "-p" */
203 if (!strcmp(arg, "-p") || !strcmp(arg, "-u")) {
204 diff_output_format = DIFF_FORMAT_PATCH;
205 continue;
206 }
207 if (!strncmp(arg, "-B", 2)) {
208 if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
209 usage(diff_cache_usage);
210 continue;
211 }
212 if (!strncmp(arg, "-M", 2)) {
213 detect_rename = DIFF_DETECT_RENAME;
214 if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
215 usage(diff_cache_usage);
216 continue;
217 }
218 if (!strncmp(arg, "-C", 2)) {
219 detect_rename = DIFF_DETECT_COPY;
220 if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
221 usage(diff_cache_usage);
222 continue;
223 }
224 if (!strcmp(arg, "--find-copies-harder")) {
225 find_copies_harder = 1;
226 continue;
227 }
228 if (!strcmp(arg, "-z")) {
229 diff_output_format = DIFF_FORMAT_MACHINE;
230 continue;
231 }
232 if (!strcmp(arg, "--name-only")) {
233 diff_output_format = DIFF_FORMAT_NAME;
234 continue;
235 }
236 if (!strcmp(arg, "--name-only-z")) {
237 diff_output_format = DIFF_FORMAT_NAME_Z;
238 continue;
239 }
240 if (!strcmp(arg, "-R")) {
241 diff_setup_opt |= DIFF_SETUP_REVERSE;
242 continue;
243 }
244 if (!strncmp(arg, "-S", 2)) {
245 pickaxe = arg + 2;
246 continue;
247 }
248 if (!strncmp(arg, "--diff-filter=", 14)) {
249 diff_filter = arg + 14;
250 continue;
251 }
252 if (!strncmp(arg, "-O", 2)) {
253 orderfile = arg + 2;
254 continue;
255 }
256 if (!strcmp(arg, "--pickaxe-all")) {
257 pickaxe_opts = DIFF_PICKAXE_ALL;
258 continue;
259 }
260 if (!strcmp(arg, "-m")) {
261 match_nonexisting = 1;
262 continue;
263 }
264 if (!strcmp(arg, "--cached")) {
265 cached_only = 1;
266 continue;
267 }
268 usage(diff_cache_usage);
269 }
270 if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
272 usage(diff_cache_usage);
273 if (!tree_name || get_sha1(tree_name, sha1))
275 usage(diff_cache_usage);
276 /* The rest is for paths restriction. */
278 diff_setup(diff_setup_opt);
279 mark_merge_entries();
281 tree = read_object_with_reference(sha1, "tree", &size, NULL);
283 if (!tree)
284 die("bad tree object %s", tree_name);
285 if (read_tree(tree, size, 1, pathspec))
286 die("unable to read tree object %s", tree_name);
287 ret = diff_cache(active_cache, active_nr, pathspec);
289 diffcore_std(pathspec,
291 detect_rename, diff_score_opt,
292 pickaxe, pickaxe_opts,
293 diff_break_opt,
294 orderfile, diff_filter);
295 diff_flush(diff_output_format);
296 return ret;
297}