[PATCH] Remove a function not used anymore.
[git/git.git] / diff-cache.c
CommitLineData
e74f8f6a 1#include "cache.h"
f92a4465 2#include "diff.h"
e74f8f6a
LT
3
4static int cached_only = 0;
81e50eab 5static int diff_output_format = DIFF_FORMAT_HUMAN;
160c8433 6static int match_nonexisting = 0;
5c97558c 7static int detect_rename = 0;
19feebc8 8static int diff_setup_opt = 0;
57fe64a4 9static int diff_score_opt = 0;
057c7d30 10static const char *pickaxe = NULL;
e74f8f6a 11
e74f8f6a 12/* A file entry went away or appeared */
c9cddabe 13static void show_file(const char *prefix, struct cache_entry *ce, unsigned char *sha1, unsigned int mode)
e74f8f6a 14{
57fe64a4 15 diff_addremove(prefix[0], ntohl(mode), sha1, ce->name, NULL);
e74f8f6a
LT
16}
17
c9cddabe 18static int get_stat_data(struct cache_entry *ce, unsigned char **sha1p, unsigned int *modep)
e74f8f6a 19{
c9cddabe
LT
20 unsigned char *sha1 = ce->sha1;
21 unsigned int mode = ce->ce_mode;
e74f8f6a
LT
22
23 if (!cached_only) {
24 static unsigned char no_sha1[20];
b5af9107 25 int changed;
e74f8f6a 26 struct stat st;
160c8433
LT
27 if (lstat(ce->name, &st) < 0) {
28 if (errno == ENOENT && match_nonexisting) {
29 *sha1p = sha1;
30 *modep = mode;
31 return 0;
32 }
e74f8f6a 33 return -1;
160c8433 34 }
5d728c84 35 changed = ce_match_stat(ce, &st);
e74f8f6a 36 if (changed) {
c9cddabe 37 mode = create_ce_mode(st.st_mode);
b5af9107 38 sha1 = no_sha1;
e74f8f6a
LT
39 }
40 }
41
c9cddabe
LT
42 *sha1p = sha1;
43 *modep = mode;
44 return 0;
45}
46
b836825b 47static void show_new_file(struct cache_entry *new)
c9cddabe
LT
48{
49 unsigned char *sha1;
50 unsigned int mode;
51
52 /* New file in the index: it might actually be different in the working copy */
53 if (get_stat_data(new, &sha1, &mode) < 0)
b836825b 54 return;
c9cddabe
LT
55
56 show_file("+", new, sha1, mode);
57}
58
66026590
JH
59static int show_modified(struct cache_entry *old,
60 struct cache_entry *new,
61 int report_missing)
c9cddabe
LT
62{
63 unsigned int mode, oldmode;
64 unsigned char *sha1;
c9cddabe
LT
65
66 if (get_stat_data(new, &sha1, &mode) < 0) {
66026590
JH
67 if (report_missing)
68 show_file("-", old, old->sha1, old->ce_mode);
c9cddabe
LT
69 return -1;
70 }
71
72 oldmode = old->ce_mode;
c3e7fbcb 73 if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
6b14d7fa 74 detect_rename < DIFF_DETECT_COPY)
e74f8f6a
LT
75 return 0;
76
c9cddabe
LT
77 mode = ntohl(mode);
78 oldmode = ntohl(oldmode);
79
57fe64a4
JH
80 diff_change(oldmode, mode,
81 old->sha1, sha1, old->name, NULL);
e74f8f6a
LT
82 return 0;
83}
84
b5af9107 85static int diff_cache(struct cache_entry **ac, int entries)
e74f8f6a 86{
b5af9107
LT
87 while (entries) {
88 struct cache_entry *ce = *ac;
dbbce55b 89 int same = (entries > 1) && ce_same_name(ce, ac[1]);
e74f8f6a 90
b0fe89ca
LT
91 switch (ce_stage(ce)) {
92 case 0:
93 /* No stage 1 entry? That means it's a new file */
94 if (!same) {
c9cddabe 95 show_new_file(ce);
b0fe89ca
LT
96 break;
97 }
98 /* Show difference between old and new */
66026590 99 show_modified(ac[1], ce, 1);
b0fe89ca
LT
100 break;
101 case 1:
102 /* No stage 3 (merge) entry? That means it's been deleted */
103 if (!same) {
c9cddabe 104 show_file("-", ce, ce->sha1, ce->ce_mode);
b0fe89ca
LT
105 break;
106 }
66026590
JH
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 */
b0fe89ca 120 case 3:
57fe64a4 121 diff_unmerge(ce->name);
b0fe89ca
LT
122 break;
123
124 default:
125 die("impossible cache entry stage");
e74f8f6a 126 }
b0fe89ca
LT
127
128 /*
129 * Ignore all the different stages for this file,
130 * we've handled the relevant cases now.
131 */
132 do {
e74f8f6a
LT
133 ac++;
134 entries--;
dbbce55b 135 } while (entries && ce_same_name(ce, ac[0]));
e74f8f6a
LT
136 }
137 return 0;
138}
139
b0fe89ca
LT
140/*
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)
b5af9107
LT
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))
5697ecc7 151 continue;
b0fe89ca 152 ce->ce_flags |= htons(CE_STAGEMASK);
b5af9107
LT
153 }
154}
155
f92a4465 156static char *diff_cache_usage =
b1c006dd 157"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish> [<path>...]";
c5bac17a 158
6b14d7fa 159int main(int argc, const char **argv)
e74f8f6a 160{
6c56c534
LT
161 const char *tree_name = NULL;
162 unsigned char sha1[20];
163 const char **pathspec = NULL;
e74f8f6a
LT
164 void *tree;
165 unsigned long size;
5c97558c 166 int ret;
6c56c534 167 int i;
e74f8f6a
LT
168
169 read_cache();
6c56c534
LT
170 for (i = 1; i < argc; i++) {
171 const char *arg = argv[i];
172
173 if (*arg != '-') {
174 if (tree_name) {
175 pathspec = argv + i;
176 break;
177 }
178 tree_name = arg;
179 continue;
180 }
181
e74f8f6a 182 if (!strcmp(arg, "-r")) {
667bb59b 183 /* We accept the -r flag just to look like git-diff-tree */
e74f8f6a
LT
184 continue;
185 }
f92a4465 186 if (!strcmp(arg, "-p")) {
81e50eab 187 diff_output_format = DIFF_FORMAT_PATCH;
f92a4465
JH
188 continue;
189 }
57fe64a4 190 if (!strncmp(arg, "-M", 2)) {
6b14d7fa 191 detect_rename = DIFF_DETECT_RENAME;
57fe64a4 192 diff_score_opt = diff_scoreopt_parse(arg);
5c97558c
JH
193 continue;
194 }
427dcb4b 195 if (!strncmp(arg, "-C", 2)) {
6b14d7fa 196 detect_rename = DIFF_DETECT_COPY;
427dcb4b
JH
197 diff_score_opt = diff_scoreopt_parse(arg);
198 continue;
199 }
e74f8f6a 200 if (!strcmp(arg, "-z")) {
81e50eab 201 diff_output_format = DIFF_FORMAT_MACHINE;
e74f8f6a
LT
202 continue;
203 }
57fe64a4 204 if (!strcmp(arg, "-R")) {
19feebc8 205 diff_setup_opt |= DIFF_SETUP_REVERSE;
57fe64a4
JH
206 continue;
207 }
52e95789
JH
208 if (!strcmp(arg, "-S")) {
209 pickaxe = arg + 2;
210 continue;
211 }
160c8433
LT
212 if (!strcmp(arg, "-m")) {
213 match_nonexisting = 1;
214 continue;
215 }
e74f8f6a
LT
216 if (!strcmp(arg, "--cached")) {
217 cached_only = 1;
218 continue;
219 }
c5bac17a 220 usage(diff_cache_usage);
e74f8f6a
LT
221 }
222
6c56c534 223 if (!tree_name || get_sha1(tree_name, sha1))
c5bac17a 224 usage(diff_cache_usage);
e74f8f6a 225
6b14d7fa 226 /* The rest is for paths restriction. */
19feebc8 227 diff_setup(diff_setup_opt);
5c97558c 228
b0fe89ca 229 mark_merge_entries();
b5af9107 230
6c56c534 231 tree = read_object_with_reference(sha1, "tree", &size, NULL);
e74f8f6a 232 if (!tree)
6c56c534 233 die("bad tree object %s", tree_name);
b5af9107 234 if (read_tree(tree, size, 1))
6c56c534 235 die("unable to read tree object %s", tree_name);
e74f8f6a 236
5c97558c 237 ret = diff_cache(active_cache, active_nr);
38c6f780 238 if (detect_rename)
6b14d7fa 239 diffcore_rename(detect_rename, diff_score_opt);
38c6f780 240 if (pickaxe)
6b14d7fa 241 diffcore_pickaxe(pickaxe);
6c56c534
LT
242 if (pathspec)
243 diffcore_pathspec(pathspec);
b6d8f309 244 diff_flush(diff_output_format, 1);
5c97558c 245 return ret;
e74f8f6a 246}