Skip to content
Newer
Older
100644 305 lines (258 sloc) 6.91 KB
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 23, 2008
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"
c455c87 @dscho Rename path_list to string_list
dscho authored Jul 21, 2008
17 #include "string-list.h"
fd3aeea @babourn diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()
babourn authored Mar 19, 2014
18 #include "dir.h"
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
19
9daf0ef @babourn diff-no-index: rename read_directory()
babourn authored Mar 19, 2014
20 static int read_directory_contents(const char *path, struct string_list *list)
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
21 {
22 DIR *dir;
23 struct dirent *e;
24
25 if (!(dir = opendir(path)))
26 return error("Could not open directory %s", path);
27
28 while ((e = readdir(dir)))
fd3aeea @babourn diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()
babourn authored Mar 19, 2014
29 if (!is_dot_or_dotdot(e->d_name))
78a395d @qur string_list: Fix argument order for string_list_insert
qur authored Jun 26, 2010
30 string_list_insert(list, e->d_name);
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
31
32 closedir(dir);
33 return 0;
34 }
35
4682d85 @gitster diff-index.c: "git diff" has no need to read blob from the standard i…
gitster authored Jun 27, 2012
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
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
43 static int get_mode(const char *path, int *mode)
44 {
45 struct stat st;
46
47 if (!path || !strcmp(path, "/dev/null"))
48 *mode = 0;
380395d @jrn mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
jrn authored May 2, 2013
49 #ifdef GIT_WINDOWS_NATIVE
36adb4a @dscho MinGW: fix diff --no-index /dev/null ...
dscho authored Mar 7, 2009
50 else if (!strcasecmp(path, "nul"))
51 *mode = 0;
52 #endif
4682d85 @gitster diff-index.c: "git diff" has no need to read blob from the standard i…
gitster authored Jun 28, 2012
53 else if (path == file_from_standard_input)
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
54 *mode = create_ce_mode(0666);
418566b @dscho Fix 'git diff --no-index' with a non-existing symlink target
dscho authored Jan 29, 2009
55 else if (lstat(path, &st))
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
56 return error("Could not access '%s'", path);
57 else
58 *mode = st.st_mode;
59 return 0;
60 }
61
4682d85 @gitster diff-index.c: "git diff" has no need to read blob from the standard i…
gitster authored Jun 28, 2012
62 static int populate_from_stdin(struct diff_filespec *s)
63 {
64 struct strbuf buf = STRBUF_INIT;
65 size_t size = 0;
66
67 if (strbuf_read(&buf, 0, 0) < 0)
68 return error("error while reading from stdin %s",
69 strerror(errno));
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);
3b75314 @gitster Merge branch 'jk/maint-null-in-trees'
gitster authored Aug 27, 2012
86 fill_filespec(s, null_sha1, 0, mode);
4682d85 @gitster diff-index.c: "git diff" has no need to read blob from the standard i…
gitster authored Jun 28, 2012
87 if (name == file_from_standard_input)
88 populate_from_stdin(s);
89 return s;
90 }
91
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
92 static int queue_diff(struct diff_options *o,
875b91b @gitster diff --no-index: use strbuf for temporary pathnames
gitster authored Apr 25, 2012
93 const char *name1, const char *name2)
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
94 {
95 int mode1 = 0, mode2 = 0;
96
97 if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
98 return -1;
99
0615173 @gitster diff-no-index: align D/F handling with that of normal Git
gitster authored Mar 21, 2015
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 }
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
121
122 if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
875b91b @gitster diff --no-index: use strbuf for temporary pathnames
gitster authored Apr 25, 2012
123 struct strbuf buffer1 = STRBUF_INIT;
124 struct strbuf buffer2 = STRBUF_INIT;
183113a string_list: Add STRING_LIST_INIT macro and make use of it.
Thiago Farina authored Jul 4, 2010
125 struct string_list p1 = STRING_LIST_INIT_DUP;
126 struct string_list p2 = STRING_LIST_INIT_DUP;
875b91b @gitster diff --no-index: use strbuf for temporary pathnames
gitster authored Apr 25, 2012
127 int i1, i2, ret = 0;
f3999e0 @bpowers diff --no-index: reset temporary buffer lengths on directory iteration
bpowers authored May 16, 2012
128 size_t len1 = 0, len2 = 0;
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
129
9daf0ef @babourn diff-no-index: rename read_directory()
babourn authored Mar 19, 2014
130 if (name1 && read_directory_contents(name1, &p1))
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
131 return -1;
9daf0ef @babourn diff-no-index: rename read_directory()
babourn authored Mar 19, 2014
132 if (name2 && read_directory_contents(name2, &p2)) {
c455c87 @dscho Rename path_list to string_list
dscho authored Jul 21, 2008
133 string_list_clear(&p1, 0);
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
134 return -1;
135 }
136
137 if (name1) {
875b91b @gitster diff --no-index: use strbuf for temporary pathnames
gitster authored Apr 25, 2012
138 strbuf_addstr(&buffer1, name1);
00b6c17 @peff use strbuf_complete to conditionally append slash
peff authored Sep 24, 2015
139 strbuf_complete(&buffer1, '/');
f3999e0 @bpowers diff --no-index: reset temporary buffer lengths on directory iteration
bpowers authored May 16, 2012
140 len1 = buffer1.len;
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
141 }
142
143 if (name2) {
875b91b @gitster diff --no-index: use strbuf for temporary pathnames
gitster authored Apr 25, 2012
144 strbuf_addstr(&buffer2, name2);
00b6c17 @peff use strbuf_complete to conditionally append slash
peff authored Sep 24, 2015
145 strbuf_complete(&buffer2, '/');
f3999e0 @bpowers diff --no-index: reset temporary buffer lengths on directory iteration
bpowers authored May 16, 2012
146 len2 = buffer2.len;
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
147 }
148
149 for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
150 const char *n1, *n2;
151 int comp;
152
f3999e0 @bpowers diff --no-index: reset temporary buffer lengths on directory iteration
bpowers authored May 16, 2012
153 strbuf_setlen(&buffer1, len1);
154 strbuf_setlen(&buffer2, len2);
155
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
156 if (i1 == p1.nr)
157 comp = 1;
158 else if (i2 == p2.nr)
159 comp = -1;
160 else
875b91b @gitster diff --no-index: use strbuf for temporary pathnames
gitster authored Apr 25, 2012
161 comp = strcmp(p1.items[i1].string, p2.items[i2].string);
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
162
163 if (comp > 0)
164 n1 = NULL;
165 else {
875b91b @gitster diff --no-index: use strbuf for temporary pathnames
gitster authored Apr 25, 2012
166 strbuf_addstr(&buffer1, p1.items[i1++].string);
167 n1 = buffer1.buf;
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
168 }
169
170 if (comp < 0)
171 n2 = NULL;
172 else {
875b91b @gitster diff --no-index: use strbuf for temporary pathnames
gitster authored Apr 25, 2012
173 strbuf_addstr(&buffer2, p2.items[i2++].string);
174 n2 = buffer2.buf;
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
175 }
176
177 ret = queue_diff(o, n1, n2);
178 }
c455c87 @dscho Rename path_list to string_list
dscho authored Jul 21, 2008
179 string_list_clear(&p1, 0);
180 string_list_clear(&p2, 0);
176a335 @bpowers diff --no-index: don't leak buffers in queue_diff
bpowers authored May 16, 2012
181 strbuf_release(&buffer1);
182 strbuf_release(&buffer2);
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
183
184 return ret;
185 } else {
186 struct diff_filespec *d1, *d2;
187
188 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
189 unsigned tmp;
190 const char *tmp_c;
191 tmp = mode1; mode1 = mode2; mode2 = tmp;
192 tmp_c = name1; name1 = name2; name2 = tmp_c;
193 }
194
4682d85 @gitster diff-index.c: "git diff" has no need to read blob from the standard i…
gitster authored Jun 28, 2012
195 d1 = noindex_filespec(name1, mode1);
196 d2 = noindex_filespec(name2, mode2);
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
197 diff_queue(&diff_queued_diff, d1, d2);
198 return 0;
199 }
200 }
201
c9e1f2c @gitster diff-no-index: DWIM "diff D F" into "diff D/F F"
gitster authored Mar 25, 2015
202 /* append basename of F to D */
203 static void append_basename(struct strbuf *path, const char *dir, const char *file)
204 {
205 const char *tail = strrchr(file, '/');
206
207 strbuf_addstr(path, dir);
208 while (path->len && path->buf[path->len - 1] == '/')
209 path->len--;
210 strbuf_addch(path, '/');
211 strbuf_addstr(path, tail ? tail + 1 : file);
212 }
213
214 /*
215 * DWIM "diff D F" into "diff D/F F" and "diff F D" into "diff F D/F"
216 * Note that we append the basename of F to D/, so "diff a/b/file D"
217 * becomes "diff a/b/file D/file", not "diff a/b/file D/a/b/file".
218 */
219 static void fixup_paths(const char **path, struct strbuf *replacement)
220 {
221 unsigned int isdir0, isdir1;
222
223 if (path[0] == file_from_standard_input ||
224 path[1] == file_from_standard_input)
225 return;
226 isdir0 = is_directory(path[0]);
227 isdir1 = is_directory(path[1]);
228 if (isdir0 == isdir1)
229 return;
230 if (isdir0) {
231 append_basename(replacement, path[0], path[1]);
232 path[0] = replacement->buf;
233 } else {
234 append_basename(replacement, path[1], path[0]);
235 path[1] = replacement->buf;
236 }
237 }
238
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
239 void diff_no_index(struct rev_info *revs,
e5f7a5d @pclouds diff-no-index: do not take a redundant prefix argument
pclouds authored Jan 20, 2016
240 int argc, const char **argv)
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
241 {
3b069b1 @gitster diff-index.c: unify handling of command line paths
gitster authored Jun 27, 2012
242 int i, prefixlen;
c20f592 @gitster diff-index.c: do not pretend paths are pathspecs
gitster authored Jun 27, 2012
243 const char *paths[2];
c9e1f2c @gitster diff-no-index: DWIM "diff D F" into "diff D/F F"
gitster authored Mar 25, 2015
244 struct strbuf replacement = STRBUF_INIT;
e5f7a5d @pclouds diff-no-index: do not take a redundant prefix argument
pclouds authored Jan 20, 2016
245 const char *prefix = revs->prefix;
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
246
247 diff_setup(&revs->diffopt);
248 for (i = 1; i < argc - 2; ) {
249 int j;
250 if (!strcmp(argv[i], "--no-index"))
251 i++;
e423ffd @trast diff: accept -- when using --no-index
trast authored Jan 6, 2009
252 else if (!strcmp(argv[i], "--"))
253 i++;
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
254 else {
a97262c @pclouds diff: make -O and --output work in subdirectory
pclouds authored Jan 21, 2016
255 j = diff_opt_parse(&revs->diffopt, argv + i, argc - i,
256 revs->prefix);
ad1c3fb @gitster diff-no-index: correctly diagnose error return from diff_opt_parse()
gitster authored Mar 31, 2014
257 if (j <= 0)
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
258 die("invalid diff option/value: %s", argv[i]);
259 i += j;
260 }
261 }
262
3b069b1 @gitster diff-index.c: unify handling of command line paths
gitster authored Jun 27, 2012
263 prefixlen = prefix ? strlen(prefix) : 0;
264 for (i = 0; i < 2; i++) {
265 const char *p = argv[argc - 2 + i];
266 if (!strcmp(p, "-"))
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
267 /*
3b069b1 @gitster diff-index.c: unify handling of command line paths
gitster authored Jun 27, 2012
268 * stdin should be spelled as "-"; if you have
269 * path that is "-", spell it as "./-".
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
270 */
4682d85 @gitster diff-index.c: "git diff" has no need to read blob from the standard i…
gitster authored Jun 28, 2012
271 p = file_from_standard_input;
3b069b1 @gitster diff-index.c: unify handling of command line paths
gitster authored Jun 27, 2012
272 else if (prefixlen)
273 p = xstrdup(prefix_filename(prefix, prefixlen, p));
274 paths[i] = p;
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
275 }
c9e1f2c @gitster diff-no-index: DWIM "diff D F" into "diff D/F F"
gitster authored Mar 25, 2015
276
277 fixup_paths(paths, &replacement);
278
d61027b Skip timestamp differences for diff --no-index
Michael Spang authored Feb 18, 2009
279 revs->diffopt.skip_stat_unmatch = 1;
5d83f9c @j6t diff --no-index: Do not generate patch output if other output is requ…
j6t authored Mar 25, 2009
280 if (!revs->diffopt.output_format)
281 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
282
283 DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
284
285 revs->max_count = -2;
2845265 @trast diff_setup_done(): return void
trast authored Aug 3, 2012
286 diff_setup_done(&revs->diffopt);
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
287
af63b54 @peff do not run pager with diff --no-index --quiet
peff authored Jun 15, 2012
288 setup_diff_pager(&revs->diffopt);
289 DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
290
c20f592 @gitster diff-index.c: do not pretend paths are pathspecs
gitster authored Jun 27, 2012
291 if (queue_diff(&revs->diffopt, paths[0], paths[1]))
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
292 exit(1);
a5a818e @gitster diff: vary default prefix depending on what are compared
gitster authored Aug 18, 2008
293 diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
294 diffcore_std(&revs->diffopt);
295 diff_flush(&revs->diffopt);
296
c9e1f2c @gitster diff-no-index: DWIM "diff D F" into "diff D/F F"
gitster authored Mar 25, 2015
297 strbuf_release(&replacement);
298
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
299 /*
300 * The return code for --no-index imitates diff(1):
301 * 0 = no changes, 1 = changes, else error
302 */
304970d @thenigan diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' …
thenigan authored Jun 21, 2012
303 exit(diff_result_code(&revs->diffopt, 0));
0569e9b @gitster "git diff": do not ignore index without --no-index
gitster authored May 24, 2008
304 }
Something went wrong with that request. Please try again.