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