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