submodule: Fix t7400, t7405, t7406 for msysGit
[git/dscho.git] / diff-no-index.c
blob3a36144687ae2f5bf7bb3afc914ddbada8d5ff93
1 /*
2 * "diff --no-index" support
3 * Copyright (c) 2007 by Johannes Schindelin
4 * Copyright (c) 2008 by Junio C Hamano
5 */
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 "string-list.h"
19 static int read_directory(const char *path, struct string_list *list)
21 DIR *dir;
22 struct dirent *e;
24 if (!(dir = opendir(path)))
25 return error("Could not open directory %s", path);
27 while ((e = readdir(dir)))
28 if (strcmp(".", e->d_name) && strcmp("..", e->d_name))
29 string_list_insert(list, e->d_name);
31 closedir(dir);
32 return 0;
35 static int get_mode(const char *path, int *mode)
37 struct stat st;
39 if (!path || !strcmp(path, "/dev/null"))
40 *mode = 0;
41 #ifdef _WIN32
42 else if (!strcasecmp(path, "nul"))
43 *mode = 0;
44 #endif
45 else if (!strcmp(path, "-"))
46 *mode = create_ce_mode(0666);
47 else if (lstat(path, &st))
48 return error("Could not access '%s'", path);
49 else
50 *mode = st.st_mode;
51 return 0;
54 static int queue_diff(struct diff_options *o,
55 const char *name1, const char *name2)
57 int mode1 = 0, mode2 = 0;
59 if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
60 return -1;
62 if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2))
63 return error("file/directory conflict: %s, %s", name1, name2);
65 if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
66 char buffer1[PATH_MAX], buffer2[PATH_MAX];
67 struct string_list p1 = STRING_LIST_INIT_DUP;
68 struct string_list p2 = STRING_LIST_INIT_DUP;
69 int len1 = 0, len2 = 0, i1, i2, ret = 0;
71 if (name1 && read_directory(name1, &p1))
72 return -1;
73 if (name2 && read_directory(name2, &p2)) {
74 string_list_clear(&p1, 0);
75 return -1;
78 if (name1) {
79 len1 = strlen(name1);
80 if (len1 > 0 && name1[len1 - 1] == '/')
81 len1--;
82 memcpy(buffer1, name1, len1);
83 buffer1[len1++] = '/';
86 if (name2) {
87 len2 = strlen(name2);
88 if (len2 > 0 && name2[len2 - 1] == '/')
89 len2--;
90 memcpy(buffer2, name2, len2);
91 buffer2[len2++] = '/';
94 for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
95 const char *n1, *n2;
96 int comp;
98 if (i1 == p1.nr)
99 comp = 1;
100 else if (i2 == p2.nr)
101 comp = -1;
102 else
103 comp = strcmp(p1.items[i1].string,
104 p2.items[i2].string);
106 if (comp > 0)
107 n1 = NULL;
108 else {
109 n1 = buffer1;
110 strncpy(buffer1 + len1, p1.items[i1++].string,
111 PATH_MAX - len1);
114 if (comp < 0)
115 n2 = NULL;
116 else {
117 n2 = buffer2;
118 strncpy(buffer2 + len2, p2.items[i2++].string,
119 PATH_MAX - len2);
122 ret = queue_diff(o, n1, n2);
124 string_list_clear(&p1, 0);
125 string_list_clear(&p2, 0);
127 return ret;
128 } else {
129 struct diff_filespec *d1, *d2;
131 if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
132 unsigned tmp;
133 const char *tmp_c;
134 tmp = mode1; mode1 = mode2; mode2 = tmp;
135 tmp_c = name1; name1 = name2; name2 = tmp_c;
138 if (!name1)
139 name1 = "/dev/null";
140 if (!name2)
141 name2 = "/dev/null";
142 d1 = alloc_filespec(name1);
143 d2 = alloc_filespec(name2);
144 fill_filespec(d1, null_sha1, mode1);
145 fill_filespec(d2, null_sha1, mode2);
147 diff_queue(&diff_queued_diff, d1, d2);
148 return 0;
152 static int path_outside_repo(const char *path)
154 const char *work_tree;
155 size_t len;
157 if (!is_absolute_path(path))
158 return 0;
159 work_tree = get_git_work_tree();
160 if (!work_tree)
161 return 1;
162 len = strlen(work_tree);
163 if (strncmp(path, work_tree, len) ||
164 (path[len] != '\0' && path[len] != '/'))
165 return 1;
166 return 0;
169 void diff_no_index(struct rev_info *revs,
170 int argc, const char **argv,
171 int nongit, const char *prefix)
173 int i;
174 int no_index = 0;
175 unsigned options = 0;
177 /* Were we asked to do --no-index explicitly? */
178 for (i = 1; i < argc; i++) {
179 if (!strcmp(argv[i], "--")) {
180 i++;
181 break;
183 if (!strcmp(argv[i], "--no-index"))
184 no_index = 1;
185 if (argv[i][0] != '-')
186 break;
189 if (!no_index && !nongit) {
191 * Inside a git repository, without --no-index. Only
192 * when a path outside the repository is given,
193 * e.g. "git diff /var/tmp/[12]", or "git diff
194 * Makefile /var/tmp/Makefile", allow it to be used as
195 * a colourful "diff" replacement.
197 if ((argc != i + 2) ||
198 (!path_outside_repo(argv[i]) &&
199 !path_outside_repo(argv[i+1])))
200 return;
202 if (argc != i + 2)
203 usagef("git diff %s <path> <path>",
204 no_index ? "--no-index" : "[--no-index]");
206 diff_setup(&revs->diffopt);
207 for (i = 1; i < argc - 2; ) {
208 int j;
209 if (!strcmp(argv[i], "--no-index"))
210 i++;
211 else if (!strcmp(argv[i], "-q")) {
212 options |= DIFF_SILENT_ON_REMOVED;
213 i++;
215 else if (!strcmp(argv[i], "--"))
216 i++;
217 else {
218 j = diff_opt_parse(&revs->diffopt, argv + i, argc - i);
219 if (!j)
220 die("invalid diff option/value: %s", argv[i]);
221 i += j;
226 * If the user asked for our exit code then don't start a
227 * pager or we would end up reporting its exit code instead.
229 if (!DIFF_OPT_TST(&revs->diffopt, EXIT_WITH_STATUS))
230 setup_pager();
232 if (prefix) {
233 int len = strlen(prefix);
234 const char *paths[3];
235 memset(paths, 0, sizeof(paths));
237 for (i = 0; i < 2; i++) {
238 const char *p = argv[argc - 2 + i];
240 * stdin should be spelled as '-'; if you have
241 * path that is '-', spell it as ./-.
243 p = (strcmp(p, "-")
244 ? xstrdup(prefix_filename(prefix, len, p))
245 : p);
246 paths[i] = p;
248 diff_tree_setup_paths(paths, &revs->diffopt);
250 else
251 diff_tree_setup_paths(argv + argc - 2, &revs->diffopt);
252 revs->diffopt.skip_stat_unmatch = 1;
253 if (!revs->diffopt.output_format)
254 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
256 DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
257 DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
259 revs->max_count = -2;
260 if (diff_setup_done(&revs->diffopt) < 0)
261 die("diff_setup_done failed");
263 if (queue_diff(&revs->diffopt, revs->diffopt.pathspec.raw[0],
264 revs->diffopt.pathspec.raw[1]))
265 exit(1);
266 diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
267 diffcore_std(&revs->diffopt);
268 diff_flush(&revs->diffopt);
271 * The return code for --no-index imitates diff(1):
272 * 0 = no changes, 1 = changes, else error
274 exit(revs->diffopt.found_changes);