]>
Commit | Line | Data |
---|---|---|
e74f8f6a | 1 | #include "cache.h" |
f92a4465 | 2 | #include "diff.h" |
e74f8f6a LT |
3 | |
4 | static int cached_only = 0; | |
f92a4465 | 5 | static int generate_patch = 0; |
160c8433 | 6 | static int match_nonexisting = 0; |
e74f8f6a | 7 | static int line_termination = '\n'; |
5c97558c | 8 | static int detect_rename = 0; |
57fe64a4 JH |
9 | static int reverse_diff = 0; |
10 | static int diff_score_opt = 0; | |
057c7d30 | 11 | static const char *pickaxe = NULL; |
e74f8f6a | 12 | |
e74f8f6a | 13 | /* A file entry went away or appeared */ |
c9cddabe | 14 | static 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 | 19 | static 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 | 48 | static 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 |
60 | static 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 JH |
74 | if (mode == oldmode && !memcmp(sha1, old->sha1, 20) && |
75 | detect_rename < 2) | |
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 | 86 | static 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 | */ | |
146 | static 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 | 157 | static char *diff_cache_usage = |
52e95789 | 158 | "git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish>"; |
c5bac17a | 159 | |
e74f8f6a LT |
160 | int main(int argc, char **argv) |
161 | { | |
162 | unsigned char tree_sha1[20]; | |
163 | void *tree; | |
164 | unsigned long size; | |
5c97558c | 165 | int ret; |
e74f8f6a LT |
166 | |
167 | read_cache(); | |
168 | while (argc > 2) { | |
169 | char *arg = argv[1]; | |
170 | argv++; | |
171 | argc--; | |
172 | if (!strcmp(arg, "-r")) { | |
667bb59b | 173 | /* We accept the -r flag just to look like git-diff-tree */ |
e74f8f6a LT |
174 | continue; |
175 | } | |
f92a4465 JH |
176 | if (!strcmp(arg, "-p")) { |
177 | generate_patch = 1; | |
178 | continue; | |
179 | } | |
57fe64a4 | 180 | if (!strncmp(arg, "-M", 2)) { |
5c97558c | 181 | generate_patch = detect_rename = 1; |
57fe64a4 | 182 | diff_score_opt = diff_scoreopt_parse(arg); |
5c97558c JH |
183 | continue; |
184 | } | |
427dcb4b JH |
185 | if (!strncmp(arg, "-C", 2)) { |
186 | generate_patch = 1; | |
187 | detect_rename = 2; | |
188 | diff_score_opt = diff_scoreopt_parse(arg); | |
189 | continue; | |
190 | } | |
e74f8f6a LT |
191 | if (!strcmp(arg, "-z")) { |
192 | line_termination = '\0'; | |
193 | continue; | |
194 | } | |
57fe64a4 JH |
195 | if (!strcmp(arg, "-R")) { |
196 | reverse_diff = 1; | |
197 | continue; | |
198 | } | |
52e95789 JH |
199 | if (!strcmp(arg, "-S")) { |
200 | pickaxe = arg + 2; | |
201 | continue; | |
202 | } | |
160c8433 LT |
203 | if (!strcmp(arg, "-m")) { |
204 | match_nonexisting = 1; | |
205 | continue; | |
206 | } | |
e74f8f6a LT |
207 | if (!strcmp(arg, "--cached")) { |
208 | cached_only = 1; | |
209 | continue; | |
210 | } | |
c5bac17a | 211 | usage(diff_cache_usage); |
e74f8f6a LT |
212 | } |
213 | ||
3c249c95 | 214 | if (argc != 2 || get_sha1(argv[1], tree_sha1)) |
c5bac17a | 215 | usage(diff_cache_usage); |
e74f8f6a | 216 | |
38c6f780 | 217 | diff_setup(reverse_diff, (generate_patch ? -1 : line_termination)); |
5c97558c | 218 | |
b0fe89ca | 219 | mark_merge_entries(); |
b5af9107 | 220 | |
e99d59ff | 221 | tree = read_object_with_reference(tree_sha1, "tree", &size, NULL); |
e74f8f6a LT |
222 | if (!tree) |
223 | die("bad tree object %s", argv[1]); | |
b5af9107 LT |
224 | if (read_tree(tree, size, 1)) |
225 | die("unable to read tree object %s", argv[1]); | |
e74f8f6a | 226 | |
5c97558c | 227 | ret = diff_cache(active_cache, active_nr); |
38c6f780 JH |
228 | if (detect_rename) |
229 | diff_detect_rename(detect_rename, diff_score_opt); | |
230 | if (pickaxe) | |
231 | diff_pickaxe(pickaxe); | |
232 | diff_flush(NULL, 0); | |
5c97558c | 233 | return ret; |
e74f8f6a | 234 | } |