Line | Count | Source (jump to first uncovered line) |
1 | | /* |
2 | | * "diff --no-index" support |
3 | | * Copyright (c) 2007 by Johannes Schindelin |
4 | | * Copyright (c) 2008 by Junio C Hamano |
5 | | */ |
6 | | |
7 | | #include "cache.h" |
8 | | #include "color.h" |
9 | | #include "commit.h" |
10 | | #include "blob.h" |
11 | | #include "tag.h" |
12 | | #include "diff.h" |
13 | | #include "diffcore.h" |
14 | | #include "revision.h" |
15 | | #include "log-tree.h" |
16 | | #include "builtin.h" |
17 | | #include "parse-options.h" |
18 | | #include "string-list.h" |
19 | | #include "dir.h" |
20 | | |
21 | | static int read_directory_contents(const char *path, struct string_list *list) |
22 | 0 | { |
23 | 0 | DIR *dir; |
24 | 0 | struct dirent *e; |
25 | |
|
26 | 0 | if (!(dir = opendir(path))) |
27 | 0 | return error("Could not open directory %s", path); |
28 | | |
29 | 0 | while ((e = readdir_skip_dot_and_dotdot(dir))) |
30 | 0 | string_list_insert(list, e->d_name); |
31 | |
|
32 | 0 | closedir(dir); |
33 | 0 | return 0; |
34 | 0 | } |
35 | | |
36 | | /* |
37 | | * This should be "(standard input)" or something, but it will |
38 | | * probably expose many more breakages in the way no-index code |
39 | | * is bolted onto the diff callchain. |
40 | | */ |
41 | | static const char file_from_standard_input[] = "-"; |
42 | | |
43 | | static int get_mode(const char *path, int *mode) |
44 | 0 | { |
45 | 0 | struct stat st; |
46 | |
|
47 | 0 | if (!path || !strcmp(path, "/dev/null")) |
48 | 0 | *mode = 0; |
49 | | #ifdef GIT_WINDOWS_NATIVE |
50 | | else if (!strcasecmp(path, "nul")) |
51 | | *mode = 0; |
52 | | #endif |
53 | 0 | else if (path == file_from_standard_input) |
54 | 0 | *mode = create_ce_mode(0666); |
55 | 0 | else if (lstat(path, &st)) |
56 | 0 | return error("Could not access '%s'", path); |
57 | 0 | else |
58 | 0 | *mode = st.st_mode; |
59 | 0 | return 0; |
60 | 0 | } |
61 | | |
62 | | static int populate_from_stdin(struct diff_filespec *s) |
63 | 0 | { |
64 | 0 | struct strbuf buf = STRBUF_INIT; |
65 | 0 | size_t size = 0; |
66 | |
|
67 | 0 | if (strbuf_read(&buf, 0, 0) < 0) |
68 | 0 | return error_errno("error while reading from stdin"); |
69 | | |
70 | 0 | s->should_munmap = 0; |
71 | 0 | s->data = strbuf_detach(&buf, &size); |
72 | 0 | s->size = size; |
73 | 0 | s->should_free = 1; |
74 | 0 | s->is_stdin = 1; |
75 | 0 | return 0; |
76 | 0 | } |
77 | | |
78 | | static struct diff_filespec *noindex_filespec(const char *name, int mode) |
79 | 0 | { |
80 | 0 | struct diff_filespec *s; |
81 | |
|
82 | 0 | if (!name) |
83 | 0 | name = "/dev/null"; |
84 | 0 | s = alloc_filespec(name); |
85 | 0 | fill_filespec(s, null_oid(), 0, mode); |
86 | 0 | if (name == file_from_standard_input) |
87 | 0 | populate_from_stdin(s); |
88 | 0 | return s; |
89 | 0 | } |
90 | | |
91 | | static int queue_diff(struct diff_options *o, |
92 | | const char *name1, const char *name2) |
93 | 0 | { |
94 | 0 | int mode1 = 0, mode2 = 0; |
95 | |
|
96 | 0 | if (get_mode(name1, &mode1) || get_mode(name2, &mode2)) |
97 | 0 | return -1; |
98 | | |
99 | 0 | if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2)) { |
100 | 0 | struct diff_filespec *d1, *d2; |
101 | |
|
102 | 0 | if (S_ISDIR(mode1)) { |
103 | | /* 2 is file that is created */ |
104 | 0 | d1 = noindex_filespec(NULL, 0); |
105 | 0 | d2 = noindex_filespec(name2, mode2); |
106 | 0 | name2 = NULL; |
107 | 0 | mode2 = 0; |
108 | 0 | } else { |
109 | | /* 1 is file that is deleted */ |
110 | 0 | d1 = noindex_filespec(name1, mode1); |
111 | 0 | d2 = noindex_filespec(NULL, 0); |
112 | 0 | name1 = NULL; |
113 | 0 | mode1 = 0; |
114 | 0 | } |
115 | | /* emit that file */ |
116 | 0 | diff_queue(&diff_queued_diff, d1, d2); |
117 | | |
118 | | /* and then let the entire directory be created or deleted */ |
119 | 0 | } |
120 | |
|
121 | 0 | if (S_ISDIR(mode1) || S_ISDIR(mode2)) { |
122 | 0 | struct strbuf buffer1 = STRBUF_INIT; |
123 | 0 | struct strbuf buffer2 = STRBUF_INIT; |
124 | 0 | struct string_list p1 = STRING_LIST_INIT_DUP; |
125 | 0 | struct string_list p2 = STRING_LIST_INIT_DUP; |
126 | 0 | int i1, i2, ret = 0; |
127 | 0 | size_t len1 = 0, len2 = 0; |
128 | |
|
129 | 0 | if (name1 && read_directory_contents(name1, &p1)) |
130 | 0 | return -1; |
131 | 0 | if (name2 && read_directory_contents(name2, &p2)) { |
132 | 0 | string_list_clear(&p1, 0); |
133 | 0 | return -1; |
134 | 0 | } |
135 | | |
136 | 0 | if (name1) { |
137 | 0 | strbuf_addstr(&buffer1, name1); |
138 | 0 | strbuf_complete(&buffer1, '/'); |
139 | 0 | len1 = buffer1.len; |
140 | 0 | } |
141 | |
|
142 | 0 | if (name2) { |
143 | 0 | strbuf_addstr(&buffer2, name2); |
144 | 0 | strbuf_complete(&buffer2, '/'); |
145 | 0 | len2 = buffer2.len; |
146 | 0 | } |
147 | |
|
148 | 0 | for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) { |
149 | 0 | const char *n1, *n2; |
150 | 0 | int comp; |
151 | |
|
152 | 0 | strbuf_setlen(&buffer1, len1); |
153 | 0 | strbuf_setlen(&buffer2, len2); |
154 | |
|
155 | 0 | if (i1 == p1.nr) |
156 | 0 | comp = 1; |
157 | 0 | else if (i2 == p2.nr) |
158 | 0 | comp = -1; |
159 | 0 | else |
160 | 0 | comp = strcmp(p1.items[i1].string, p2.items[i2].string); |
161 | |
|
162 | 0 | if (comp > 0) |
163 | 0 | n1 = NULL; |
164 | 0 | else { |
165 | 0 | strbuf_addstr(&buffer1, p1.items[i1++].string); |
166 | 0 | n1 = buffer1.buf; |
167 | 0 | } |
168 | |
|
169 | 0 | if (comp < 0) |
170 | 0 | n2 = NULL; |
171 | 0 | else { |
172 | 0 | strbuf_addstr(&buffer2, p2.items[i2++].string); |
173 | 0 | n2 = buffer2.buf; |
174 | 0 | } |
175 | |
|
176 | 0 | ret = queue_diff(o, n1, n2); |
177 | 0 | } |
178 | 0 | string_list_clear(&p1, 0); |
179 | 0 | string_list_clear(&p2, 0); |
180 | 0 | strbuf_release(&buffer1); |
181 | 0 | strbuf_release(&buffer2); |
182 | |
|
183 | 0 | return ret; |
184 | 0 | } else { |
185 | 0 | struct diff_filespec *d1, *d2; |
186 | |
|
187 | 0 | if (o->flags.reverse_diff) { |
188 | 0 | SWAP(mode1, mode2); |
189 | 0 | SWAP(name1, name2); |
190 | 0 | } |
191 | |
|
192 | 0 | d1 = noindex_filespec(name1, mode1); |
193 | 0 | d2 = noindex_filespec(name2, mode2); |
194 | 0 | diff_queue(&diff_queued_diff, d1, d2); |
195 | 0 | return 0; |
196 | 0 | } |
197 | 0 | } |
198 | | |
199 | | /* append basename of F to D */ |
200 | | static void append_basename(struct strbuf *path, const char *dir, const char *file) |
201 | 0 | { |
202 | 0 | const char *tail = strrchr(file, '/'); |
203 | |
|
204 | 0 | strbuf_addstr(path, dir); |
205 | 0 | while (path->len && path->buf[path->len - 1] == '/') |
206 | 0 | path->len--; |
207 | 0 | strbuf_addch(path, '/'); |
208 | 0 | strbuf_addstr(path, tail ? tail + 1 : file); |
209 | 0 | } |
210 | | |
211 | | /* |
212 | | * DWIM "diff D F" into "diff D/F F" and "diff F D" into "diff F D/F" |
213 | | * Note that we append the basename of F to D/, so "diff a/b/file D" |
214 | | * becomes "diff a/b/file D/file", not "diff a/b/file D/a/b/file". |
215 | | */ |
216 | | static void fixup_paths(const char **path, struct strbuf *replacement) |
217 | 0 | { |
218 | 0 | unsigned int isdir0, isdir1; |
219 | |
|
220 | 0 | if (path[0] == file_from_standard_input || |
221 | 0 | path[1] == file_from_standard_input) |
222 | 0 | return; |
223 | 0 | isdir0 = is_directory(path[0]); |
224 | 0 | isdir1 = is_directory(path[1]); |
225 | 0 | if (isdir0 == isdir1) |
226 | 0 | return; |
227 | 0 | if (isdir0) { |
228 | 0 | append_basename(replacement, path[0], path[1]); |
229 | 0 | path[0] = replacement->buf; |
230 | 0 | } else { |
231 | 0 | append_basename(replacement, path[1], path[0]); |
232 | 0 | path[1] = replacement->buf; |
233 | 0 | } |
234 | 0 | } |
235 | | |
236 | | static const char * const diff_no_index_usage[] = { |
237 | | N_("git diff --no-index [<options>] <path> <path>"), |
238 | | NULL |
239 | | }; |
240 | | |
241 | | int diff_no_index(struct rev_info *revs, |
242 | | int implicit_no_index, |
243 | | int argc, const char **argv) |
244 | 0 | { |
245 | 0 | int i, no_index; |
246 | 0 | int ret = 1; |
247 | 0 | const char *paths[2]; |
248 | 0 | char *to_free[ARRAY_SIZE(paths)] = { 0 }; |
249 | 0 | struct strbuf replacement = STRBUF_INIT; |
250 | 0 | const char *prefix = revs->prefix; |
251 | 0 | struct option no_index_options[] = { |
252 | 0 | OPT_BOOL_F(0, "no-index", &no_index, "", |
253 | 0 | PARSE_OPT_NONEG | PARSE_OPT_HIDDEN), |
254 | 0 | OPT_END(), |
255 | 0 | }; |
256 | 0 | struct option *options; |
257 | |
|
258 | 0 | options = add_diff_options(no_index_options, &revs->diffopt); |
259 | 0 | argc = parse_options(argc, argv, revs->prefix, options, |
260 | 0 | diff_no_index_usage, 0); |
261 | 0 | if (argc != 2) { |
262 | 0 | if (implicit_no_index) |
263 | 0 | warning(_("Not a git repository. Use --no-index to " |
264 | 0 | "compare two paths outside a working tree")); |
265 | 0 | usage_with_options(diff_no_index_usage, options); |
266 | 0 | } |
267 | 0 | FREE_AND_NULL(options); |
268 | 0 | for (i = 0; i < 2; i++) { |
269 | 0 | const char *p = argv[i]; |
270 | 0 | if (!strcmp(p, "-")) |
271 | | /* |
272 | | * stdin should be spelled as "-"; if you have |
273 | | * path that is "-", spell it as "./-". |
274 | | */ |
275 | 0 | p = file_from_standard_input; |
276 | 0 | else if (prefix) |
277 | 0 | p = to_free[i] = prefix_filename(prefix, p); |
278 | 0 | paths[i] = p; |
279 | 0 | } |
280 | |
|
281 | 0 | fixup_paths(paths, &replacement); |
282 | |
|
283 | 0 | revs->diffopt.skip_stat_unmatch = 1; |
284 | 0 | if (!revs->diffopt.output_format) |
285 | 0 | revs->diffopt.output_format = DIFF_FORMAT_PATCH; |
286 | |
|
287 | 0 | revs->diffopt.flags.no_index = 1; |
288 | |
|
289 | 0 | revs->diffopt.flags.relative_name = 1; |
290 | 0 | revs->diffopt.prefix = prefix; |
291 | |
|
292 | 0 | revs->max_count = -2; |
293 | 0 | diff_setup_done(&revs->diffopt); |
294 | |
|
295 | 0 | setup_diff_pager(&revs->diffopt); |
296 | 0 | revs->diffopt.flags.exit_with_status = 1; |
297 | |
|
298 | 0 | if (queue_diff(&revs->diffopt, paths[0], paths[1])) |
299 | 0 | goto out; |
300 | 0 | diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/"); |
301 | 0 | diffcore_std(&revs->diffopt); |
302 | 0 | diff_flush(&revs->diffopt); |
303 | | |
304 | | /* |
305 | | * The return code for --no-index imitates diff(1): |
306 | | * 0 = no changes, 1 = changes, else error |
307 | | */ |
308 | 0 | ret = diff_result_code(&revs->diffopt, 0); |
309 | |
|
310 | 0 | out: |
311 | 0 | for (i = 0; i < ARRAY_SIZE(to_free); i++) |
312 | 0 | free(to_free[i]); |
313 | 0 | strbuf_release(&replacement); |
314 | 0 | return ret; |
315 | 0 | } |