"git diff": do not ignore index without --no-index
[git/git.git] / diff-no-index.c
CommitLineData
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
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 "path-list.h"
18
19static int read_directory(const char *path, struct path_list *list)
20{
21 DIR *dir;
22 struct dirent *e;
23
24 if (!(dir = opendir(path)))
25 return error("Could not open directory %s", path);
26
27 while ((e = readdir(dir)))
28 if (strcmp(".", e->d_name) && strcmp("..", e->d_name))
29 path_list_insert(e->d_name, list);
30
31 closedir(dir);
32 return 0;
33}
34
35static int get_mode(const char *path, int *mode)
36{
37 struct stat st;
38
39 if (!path || !strcmp(path, "/dev/null"))
40 *mode = 0;
41 else if (!strcmp(path, "-"))
42 *mode = create_ce_mode(0666);
43 else if (stat(path, &st))
44 return error("Could not access '%s'", path);
45 else
46 *mode = st.st_mode;
47 return 0;
48}
49
50static int queue_diff(struct diff_options *o,
51 const char *name1, const char *name2)
52{
53 int mode1 = 0, mode2 = 0;
54
55 if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
56 return -1;
57
58 if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2))
59 return error("file/directory conflict: %s, %s", name1, name2);
60
61 if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
62 char buffer1[PATH_MAX], buffer2[PATH_MAX];
63 struct path_list p1 = {NULL, 0, 0, 1}, p2 = {NULL, 0, 0, 1};
64 int len1 = 0, len2 = 0, i1, i2, ret = 0;
65
66 if (name1 && read_directory(name1, &p1))
67 return -1;
68 if (name2 && read_directory(name2, &p2)) {
69 path_list_clear(&p1, 0);
70 return -1;
71 }
72
73 if (name1) {
74 len1 = strlen(name1);
75 if (len1 > 0 && name1[len1 - 1] == '/')
76 len1--;
77 memcpy(buffer1, name1, len1);
78 buffer1[len1++] = '/';
79 }
80
81 if (name2) {
82 len2 = strlen(name2);
83 if (len2 > 0 && name2[len2 - 1] == '/')
84 len2--;
85 memcpy(buffer2, name2, len2);
86 buffer2[len2++] = '/';
87 }
88
89 for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
90 const char *n1, *n2;
91 int comp;
92
93 if (i1 == p1.nr)
94 comp = 1;
95 else if (i2 == p2.nr)
96 comp = -1;
97 else
98 comp = strcmp(p1.items[i1].path,
99 p2.items[i2].path);
100
101 if (comp > 0)
102 n1 = NULL;
103 else {
104 n1 = buffer1;
105 strncpy(buffer1 + len1, p1.items[i1++].path,
106 PATH_MAX - len1);
107 }
108
109 if (comp < 0)
110 n2 = NULL;
111 else {
112 n2 = buffer2;
113 strncpy(buffer2 + len2, p2.items[i2++].path,
114 PATH_MAX - len2);
115 }
116
117 ret = queue_diff(o, n1, n2);
118 }
119 path_list_clear(&p1, 0);
120 path_list_clear(&p2, 0);
121
122 return ret;
123 } else {
124 struct diff_filespec *d1, *d2;
125
126 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
127 unsigned tmp;
128 const char *tmp_c;
129 tmp = mode1; mode1 = mode2; mode2 = tmp;
130 tmp_c = name1; name1 = name2; name2 = tmp_c;
131 }
132
133 if (!name1)
134 name1 = "/dev/null";
135 if (!name2)
136 name2 = "/dev/null";
137 d1 = alloc_filespec(name1);
138 d2 = alloc_filespec(name2);
139 fill_filespec(d1, null_sha1, mode1);
140 fill_filespec(d2, null_sha1, mode2);
141
142 diff_queue(&diff_queued_diff, d1, d2);
143 return 0;
144 }
145}
146
147void diff_no_index(struct rev_info *revs,
148 int argc, const char **argv,
149 int nongit, const char *prefix)
150{
151 int i;
152 int no_index = 0;
153 unsigned options = 0;
154
155 /* Were we asked to do --no-index explicitly? */
156 for (i = 1; i < argc; i++) {
157 if (!strcmp(argv[i], "--"))
158 return;
159 if (!strcmp(argv[i], "--no-index"))
160 no_index = 1;
161 if (argv[i][0] != '-')
162 break;
163 }
164
165 /*
166 * No explicit --no-index, but "git diff --opts A B" outside
167 * a git repository is a cute hack to support.
168 */
169 if (!no_index && !nongit)
170 return;
171
172 if (argc != i + 2)
173 die("git diff %s takes two paths",
174 no_index ? "--no-index" : "[--no-index]");
175
176 diff_setup(&revs->diffopt);
177 if (!revs->diffopt.output_format)
178 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
179 for (i = 1; i < argc - 2; ) {
180 int j;
181 if (!strcmp(argv[i], "--no-index"))
182 i++;
183 else if (!strcmp(argv[1], "-q"))
184 options |= DIFF_SILENT_ON_REMOVED;
185 else {
186 j = diff_opt_parse(&revs->diffopt, argv + i, argc - i);
187 if (!j)
188 die("invalid diff option/value: %s", argv[i]);
189 i += j;
190 }
191 }
192
193 if (prefix) {
194 int len = strlen(prefix);
195
196 revs->diffopt.paths = xcalloc(2, sizeof(char*));
197 for (i = 0; i < 2; i++) {
198 const char *p = argv[argc - 2 + i];
199 /*
200 * stdin should be spelled as '-'; if you have
201 * path that is '-', spell it as ./-.
202 */
203 p = (strcmp(p, "-")
204 ? xstrdup(prefix_filename(prefix, len, p))
205 : p);
206 revs->diffopt.paths[i] = p;
207 }
208 }
209 else
210 revs->diffopt.paths = argv + argc - 2;
211 revs->diffopt.nr_paths = 2;
212
213 DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
214 DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
215
216 revs->max_count = -2;
217 if (diff_setup_done(&revs->diffopt) < 0)
218 die("diff_setup_done failed");
219
220 if (queue_diff(&revs->diffopt, revs->diffopt.paths[0],
221 revs->diffopt.paths[1]))
222 exit(1);
223 diffcore_std(&revs->diffopt);
224 diff_flush(&revs->diffopt);
225
226 /*
227 * The return code for --no-index imitates diff(1):
228 * 0 = no changes, 1 = changes, else error
229 */
230 exit(revs->diffopt.found_changes);
231}