blob: 18edbdf4b59ec020cc58e3d16d01d92edfdc302e [file] [log] [blame]
Junio C Hamano0569e9b2008-05-23 22:28:56 -07001/*
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"
Nguyễn Thái Ngọc Duy16bb3d72019-03-24 15:20:13 +070017#include "parse-options.h"
Johannes Schindelinc455c872008-07-21 19:03:49 +010018#include "string-list.h"
Brian Bournfd3aeea2014-03-19 11:58:22 -040019#include "dir.h"
Junio C Hamano0569e9b2008-05-23 22:28:56 -070020
Brian Bourn9daf0ef2014-03-19 11:58:21 -040021static int read_directory_contents(const char *path, struct string_list *list)
Junio C Hamano0569e9b2008-05-23 22:28:56 -070022{
23 DIR *dir;
24 struct dirent *e;
25
26 if (!(dir = opendir(path)))
27 return error("Could not open directory %s", path);
28
Elijah Newrenb548f0f2021-05-12 17:28:22 +000029 while ((e = readdir_skip_dot_and_dotdot(dir)))
30 string_list_insert(list, e->d_name);
Junio C Hamano0569e9b2008-05-23 22:28:56 -070031
32 closedir(dir);
33 return 0;
34}
35
Junio C Hamano4682d852012-06-27 20:14:47 -070036/*
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 */
41static const char file_from_standard_input[] = "-";
42
Junio C Hamano0569e9b2008-05-23 22:28:56 -070043static int get_mode(const char *path, int *mode)
44{
45 struct stat st;
46
47 if (!path || !strcmp(path, "/dev/null"))
48 *mode = 0;
Jonathan Nieder380395d2013-05-02 20:26:08 +010049#ifdef GIT_WINDOWS_NATIVE
Johannes Schindelin36adb4a2009-03-07 16:51:33 +010050 else if (!strcasecmp(path, "nul"))
51 *mode = 0;
52#endif
Junio C Hamano4682d852012-06-27 20:14:47 -070053 else if (path == file_from_standard_input)
Junio C Hamano0569e9b2008-05-23 22:28:56 -070054 *mode = create_ce_mode(0666);
Johannes Schindelin418566b2009-01-29 17:30:51 +010055 else if (lstat(path, &st))
Junio C Hamano0569e9b2008-05-23 22:28:56 -070056 return error("Could not access '%s'", path);
57 else
58 *mode = st.st_mode;
59 return 0;
60}
61
Junio C Hamano4682d852012-06-27 20:14:47 -070062static 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)
Nguyễn Thái Ngọc Duya1f06be2016-05-08 16:47:42 +070068 return error_errno("error while reading from stdin");
Junio C Hamano4682d852012-06-27 20:14:47 -070069
70 s->should_munmap = 0;
71 s->data = strbuf_detach(&buf, &size);
72 s->size = size;
73 s->should_free = 1;
74 s->is_stdin = 1;
75 return 0;
76}
77
78static struct diff_filespec *noindex_filespec(const char *name, int mode)
79{
80 struct diff_filespec *s;
81
82 if (!name)
83 name = "/dev/null";
84 s = alloc_filespec(name);
brian m. carlson14228442021-04-26 01:02:56 +000085 fill_filespec(s, null_oid(), 0, mode);
Junio C Hamano4682d852012-06-27 20:14:47 -070086 if (name == file_from_standard_input)
87 populate_from_stdin(s);
88 return s;
89}
90
Junio C Hamano0569e9b2008-05-23 22:28:56 -070091static int queue_diff(struct diff_options *o,
Junio C Hamano875b91b2012-04-25 12:37:38 -070092 const char *name1, const char *name2)
Junio C Hamano0569e9b2008-05-23 22:28:56 -070093{
94 int mode1 = 0, mode2 = 0;
95
96 if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
97 return -1;
98
Junio C Hamano06151732015-03-21 22:11:27 -070099 if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2)) {
100 struct diff_filespec *d1, *d2;
101
102 if (S_ISDIR(mode1)) {
103 /* 2 is file that is created */
104 d1 = noindex_filespec(NULL, 0);
105 d2 = noindex_filespec(name2, mode2);
106 name2 = NULL;
107 mode2 = 0;
108 } else {
109 /* 1 is file that is deleted */
110 d1 = noindex_filespec(name1, mode1);
111 d2 = noindex_filespec(NULL, 0);
112 name1 = NULL;
113 mode1 = 0;
114 }
115 /* emit that file */
116 diff_queue(&diff_queued_diff, d1, d2);
117
118 /* and then let the entire directory be created or deleted */
119 }
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700120
121 if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
Junio C Hamano875b91b2012-04-25 12:37:38 -0700122 struct strbuf buffer1 = STRBUF_INIT;
123 struct strbuf buffer2 = STRBUF_INIT;
Thiago Farina183113a2010-07-04 16:46:19 -0300124 struct string_list p1 = STRING_LIST_INIT_DUP;
125 struct string_list p2 = STRING_LIST_INIT_DUP;
Junio C Hamano875b91b2012-04-25 12:37:38 -0700126 int i1, i2, ret = 0;
Bobby Powersf3999e02012-05-16 10:28:31 -0400127 size_t len1 = 0, len2 = 0;
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700128
Brian Bourn9daf0ef2014-03-19 11:58:21 -0400129 if (name1 && read_directory_contents(name1, &p1))
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700130 return -1;
Brian Bourn9daf0ef2014-03-19 11:58:21 -0400131 if (name2 && read_directory_contents(name2, &p2)) {
Johannes Schindelinc455c872008-07-21 19:03:49 +0100132 string_list_clear(&p1, 0);
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700133 return -1;
134 }
135
136 if (name1) {
Junio C Hamano875b91b2012-04-25 12:37:38 -0700137 strbuf_addstr(&buffer1, name1);
Jeff King00b6c172015-09-24 17:08:35 -0400138 strbuf_complete(&buffer1, '/');
Bobby Powersf3999e02012-05-16 10:28:31 -0400139 len1 = buffer1.len;
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700140 }
141
142 if (name2) {
Junio C Hamano875b91b2012-04-25 12:37:38 -0700143 strbuf_addstr(&buffer2, name2);
Jeff King00b6c172015-09-24 17:08:35 -0400144 strbuf_complete(&buffer2, '/');
Bobby Powersf3999e02012-05-16 10:28:31 -0400145 len2 = buffer2.len;
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700146 }
147
148 for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
149 const char *n1, *n2;
150 int comp;
151
Bobby Powersf3999e02012-05-16 10:28:31 -0400152 strbuf_setlen(&buffer1, len1);
153 strbuf_setlen(&buffer2, len2);
154
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700155 if (i1 == p1.nr)
156 comp = 1;
157 else if (i2 == p2.nr)
158 comp = -1;
159 else
Junio C Hamano875b91b2012-04-25 12:37:38 -0700160 comp = strcmp(p1.items[i1].string, p2.items[i2].string);
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700161
162 if (comp > 0)
163 n1 = NULL;
164 else {
Junio C Hamano875b91b2012-04-25 12:37:38 -0700165 strbuf_addstr(&buffer1, p1.items[i1++].string);
166 n1 = buffer1.buf;
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700167 }
168
169 if (comp < 0)
170 n2 = NULL;
171 else {
Junio C Hamano875b91b2012-04-25 12:37:38 -0700172 strbuf_addstr(&buffer2, p2.items[i2++].string);
173 n2 = buffer2.buf;
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700174 }
175
176 ret = queue_diff(o, n1, n2);
177 }
Johannes Schindelinc455c872008-07-21 19:03:49 +0100178 string_list_clear(&p1, 0);
179 string_list_clear(&p2, 0);
Bobby Powers176a3352012-05-16 10:50:31 -0400180 strbuf_release(&buffer1);
181 strbuf_release(&buffer2);
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700182
183 return ret;
184 } else {
185 struct diff_filespec *d1, *d2;
186
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700187 if (o->flags.reverse_diff) {
René Scharfe402bf8e2017-01-28 22:41:47 +0100188 SWAP(mode1, mode2);
René Scharfe35d803b2017-01-28 22:40:58 +0100189 SWAP(name1, name2);
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700190 }
191
Junio C Hamano4682d852012-06-27 20:14:47 -0700192 d1 = noindex_filespec(name1, mode1);
193 d2 = noindex_filespec(name2, mode2);
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700194 diff_queue(&diff_queued_diff, d1, d2);
195 return 0;
196 }
197}
198
Junio C Hamanoc9e1f2c2015-03-25 16:11:39 -0700199/* append basename of F to D */
200static void append_basename(struct strbuf *path, const char *dir, const char *file)
201{
202 const char *tail = strrchr(file, '/');
203
204 strbuf_addstr(path, dir);
205 while (path->len && path->buf[path->len - 1] == '/')
206 path->len--;
207 strbuf_addch(path, '/');
208 strbuf_addstr(path, tail ? tail + 1 : file);
209}
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 */
216static void fixup_paths(const char **path, struct strbuf *replacement)
217{
218 unsigned int isdir0, isdir1;
219
220 if (path[0] == file_from_standard_input ||
221 path[1] == file_from_standard_input)
222 return;
223 isdir0 = is_directory(path[0]);
224 isdir1 = is_directory(path[1]);
225 if (isdir0 == isdir1)
226 return;
227 if (isdir0) {
228 append_basename(replacement, path[0], path[1]);
229 path[0] = replacement->buf;
230 } else {
231 append_basename(replacement, path[1], path[0]);
232 path[1] = replacement->buf;
233 }
234}
235
Nguyễn Thái Ngọc Duy16bb3d72019-03-24 15:20:13 +0700236static const char * const diff_no_index_usage[] = {
237 N_("git diff --no-index [<options>] <path> <path>"),
238 NULL
239};
240
Junio C Hamanodcd6a8c2019-04-25 16:41:12 +0900241int diff_no_index(struct rev_info *revs,
Nguyễn Thái Ngọc Duy16bb3d72019-03-24 15:20:13 +0700242 int implicit_no_index,
243 int argc, const char **argv)
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700244{
Nguyễn Thái Ngọc Duy16bb3d72019-03-24 15:20:13 +0700245 int i, no_index;
René Scharfefffe7d82022-09-07 13:36:53 +0200246 int ret = 1;
Junio C Hamanoc20f5922012-06-27 11:51:15 -0700247 const char *paths[2];
René Scharfe07a6f942022-09-07 13:37:02 +0200248 char *to_free[ARRAY_SIZE(paths)] = { 0 };
Junio C Hamanoc9e1f2c2015-03-25 16:11:39 -0700249 struct strbuf replacement = STRBUF_INIT;
Nguyễn Thái Ngọc Duye5f7a5d2016-01-20 18:06:02 +0700250 const char *prefix = revs->prefix;
Nguyễn Thái Ngọc Duy16bb3d72019-03-24 15:20:13 +0700251 struct option no_index_options[] = {
252 OPT_BOOL_F(0, "no-index", &no_index, "",
253 PARSE_OPT_NONEG | PARSE_OPT_HIDDEN),
254 OPT_END(),
255 };
256 struct option *options;
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700257
Nguyễn Thái Ngọc Duy16bb3d72019-03-24 15:20:13 +0700258 options = parse_options_concat(no_index_options,
259 revs->diffopt.parseopts);
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);
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700267 }
Nguyễn Thái Ngọc Duy16bb3d72019-03-24 15:20:13 +0700268 FREE_AND_NULL(options);
Junio C Hamano3b069b12012-06-27 12:05:52 -0700269 for (i = 0; i < 2; i++) {
René Scharfe2b43dd02022-09-07 13:45:42 +0200270 const char *p = argv[i];
Junio C Hamano3b069b12012-06-27 12:05:52 -0700271 if (!strcmp(p, "-"))
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700272 /*
Junio C Hamano3b069b12012-06-27 12:05:52 -0700273 * stdin should be spelled as "-"; if you have
274 * path that is "-", spell it as "./-".
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700275 */
Junio C Hamano4682d852012-06-27 20:14:47 -0700276 p = file_from_standard_input;
Jeff King116fb642017-03-20 21:22:28 -0400277 else if (prefix)
René Scharfe07a6f942022-09-07 13:37:02 +0200278 p = to_free[i] = prefix_filename(prefix, p);
Junio C Hamano3b069b12012-06-27 12:05:52 -0700279 paths[i] = p;
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700280 }
Junio C Hamanoc9e1f2c2015-03-25 16:11:39 -0700281
282 fixup_paths(paths, &replacement);
283
Michael Spangd61027b2009-02-18 01:48:06 -0500284 revs->diffopt.skip_stat_unmatch = 1;
Johannes Sixt5d83f9c2009-03-25 18:19:46 +0100285 if (!revs->diffopt.output_format)
286 revs->diffopt.output_format = DIFF_FORMAT_PATCH;
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700287
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700288 revs->diffopt.flags.no_index = 1;
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700289
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700290 revs->diffopt.flags.relative_name = 1;
Jeff King7d8930d2016-09-12 20:23:32 -0700291 revs->diffopt.prefix = prefix;
292
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700293 revs->max_count = -2;
Thomas Rast28452652012-08-03 14:16:24 +0200294 diff_setup_done(&revs->diffopt);
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700295
Jeff Kingaf63b542012-06-15 16:32:55 -0400296 setup_diff_pager(&revs->diffopt);
Brandon Williams0d1e0e72017-10-31 11:19:11 -0700297 revs->diffopt.flags.exit_with_status = 1;
Jeff Kingaf63b542012-06-15 16:32:55 -0400298
Junio C Hamanoc20f5922012-06-27 11:51:15 -0700299 if (queue_diff(&revs->diffopt, paths[0], paths[1]))
René Scharfefffe7d82022-09-07 13:36:53 +0200300 goto out;
Junio C Hamanoa5a818e2008-08-18 20:08:09 -0700301 diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700302 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 */
René Scharfefffe7d82022-09-07 13:36:53 +0200309 ret = diff_result_code(&revs->diffopt, 0);
310
311out:
René Scharfe07a6f942022-09-07 13:37:02 +0200312 for (i = 0; i < ARRAY_SIZE(to_free); i++)
313 free(to_free[i]);
René Scharfefffe7d82022-09-07 13:36:53 +0200314 strbuf_release(&replacement);
315 return ret;
Junio C Hamano0569e9b2008-05-23 22:28:56 -0700316}