diff-no-index.c 6.2 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
/*
 * "diff --no-index" support
 * Copyright (c) 2007 by Johannes Schindelin
 * Copyright (c) 2008 by Junio C Hamano
 */

#include "cache.h"
#include "color.h"
#include "commit.h"
#include "blob.h"
#include "tag.h"
#include "diff.h"
#include "diffcore.h"
#include "revision.h"
#include "log-tree.h"
#include "builtin.h"
17
#include "string-list.h"
18

19
static int read_directory(const char *path, struct string_list *list)
20 21 22 23 24 25 26 27 28
{
	DIR *dir;
	struct dirent *e;

	if (!(dir = opendir(path)))
		return error("Could not open directory %s", path);

	while ((e = readdir(dir)))
		if (strcmp(".", e->d_name) && strcmp("..", e->d_name))
29
			string_list_insert(list, e->d_name);
30 31 32 33 34 35 36 37 38 39 40

	closedir(dir);
	return 0;
}

static int get_mode(const char *path, int *mode)
{
	struct stat st;

	if (!path || !strcmp(path, "/dev/null"))
		*mode = 0;
41 42 43 44
#ifdef _WIN32
	else if (!strcasecmp(path, "nul"))
		*mode = 0;
#endif
45 46
	else if (!strcmp(path, "-"))
		*mode = create_ce_mode(0666);
47
	else if (lstat(path, &st))
48 49 50 51 52 53 54
		return error("Could not access '%s'", path);
	else
		*mode = st.st_mode;
	return 0;
}

static int queue_diff(struct diff_options *o,
55
		      const char *name1, const char *name2)
56 57 58 59 60 61 62 63 64 65
{
	int mode1 = 0, mode2 = 0;

	if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
		return -1;

	if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2))
		return error("file/directory conflict: %s, %s", name1, name2);

	if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
66 67
		struct strbuf buffer1 = STRBUF_INIT;
		struct strbuf buffer2 = STRBUF_INIT;
68 69
		struct string_list p1 = STRING_LIST_INIT_DUP;
		struct string_list p2 = STRING_LIST_INIT_DUP;
70
		int i1, i2, ret = 0;
71
		size_t len1 = 0, len2 = 0;
72 73 74 75

		if (name1 && read_directory(name1, &p1))
			return -1;
		if (name2 && read_directory(name2, &p2)) {
76
			string_list_clear(&p1, 0);
77 78 79 80
			return -1;
		}

		if (name1) {
81 82 83
			strbuf_addstr(&buffer1, name1);
			if (buffer1.len && buffer1.buf[buffer1.len - 1] != '/')
				strbuf_addch(&buffer1, '/');
84
			len1 = buffer1.len;
85 86 87
		}

		if (name2) {
88 89 90
			strbuf_addstr(&buffer2, name2);
			if (buffer2.len && buffer2.buf[buffer2.len - 1] != '/')
				strbuf_addch(&buffer2, '/');
91
			len2 = buffer2.len;
92 93 94 95 96 97
		}

		for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
			const char *n1, *n2;
			int comp;

98 99 100
			strbuf_setlen(&buffer1, len1);
			strbuf_setlen(&buffer2, len2);

101 102 103 104 105
			if (i1 == p1.nr)
				comp = 1;
			else if (i2 == p2.nr)
				comp = -1;
			else
106
				comp = strcmp(p1.items[i1].string, p2.items[i2].string);
107 108 109 110

			if (comp > 0)
				n1 = NULL;
			else {
111 112
				strbuf_addstr(&buffer1, p1.items[i1++].string);
				n1 = buffer1.buf;
113 114 115 116 117
			}

			if (comp < 0)
				n2 = NULL;
			else {
118 119
				strbuf_addstr(&buffer2, p2.items[i2++].string);
				n2 = buffer2.buf;
120 121 122 123
			}

			ret = queue_diff(o, n1, n2);
		}
124 125
		string_list_clear(&p1, 0);
		string_list_clear(&p2, 0);
126 127
		strbuf_reset(&buffer1);
		strbuf_reset(&buffer2);
128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153

		return ret;
	} else {
		struct diff_filespec *d1, *d2;

		if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
			unsigned tmp;
			const char *tmp_c;
			tmp = mode1; mode1 = mode2; mode2 = tmp;
			tmp_c = name1; name1 = name2; name2 = tmp_c;
		}

		if (!name1)
			name1 = "/dev/null";
		if (!name2)
			name2 = "/dev/null";
		d1 = alloc_filespec(name1);
		d2 = alloc_filespec(name2);
		fill_filespec(d1, null_sha1, mode1);
		fill_filespec(d2, null_sha1, mode2);

		diff_queue(&diff_queued_diff, d1, d2);
		return 0;
	}
}

154 155 156 157 158 159 160 161
static int path_outside_repo(const char *path)
{
	const char *work_tree;
	size_t len;

	if (!is_absolute_path(path))
		return 0;
	work_tree = get_git_work_tree();
162 163
	if (!work_tree)
		return 1;
164 165 166 167 168 169 170
	len = strlen(work_tree);
	if (strncmp(path, work_tree, len) ||
	    (path[len] != '\0' && path[len] != '/'))
		return 1;
	return 0;
}

171 172 173 174 175 176 177 178 179 180
void diff_no_index(struct rev_info *revs,
		   int argc, const char **argv,
		   int nongit, const char *prefix)
{
	int i;
	int no_index = 0;
	unsigned options = 0;

	/* Were we asked to do --no-index explicitly? */
	for (i = 1; i < argc; i++) {
181 182 183 184
		if (!strcmp(argv[i], "--")) {
			i++;
			break;
		}
185 186 187 188 189 190
		if (!strcmp(argv[i], "--no-index"))
			no_index = 1;
		if (argv[i][0] != '-')
			break;
	}

191 192 193 194 195 196 197 198 199 200 201 202 203
	if (!no_index && !nongit) {
		/*
		 * Inside a git repository, without --no-index.  Only
		 * when a path outside the repository is given,
		 * e.g. "git diff /var/tmp/[12]", or "git diff
		 * Makefile /var/tmp/Makefile", allow it to be used as
		 * a colourful "diff" replacement.
		 */
		if ((argc != i + 2) ||
		    (!path_outside_repo(argv[i]) &&
		     !path_outside_repo(argv[i+1])))
			return;
	}
204
	if (argc != i + 2)
205 206
		usagef("git diff %s <path> <path>",
		       no_index ? "--no-index" : "[--no-index]");
207 208 209 210 211 212

	diff_setup(&revs->diffopt);
	for (i = 1; i < argc - 2; ) {
		int j;
		if (!strcmp(argv[i], "--no-index"))
			i++;
213
		else if (!strcmp(argv[i], "-q")) {
214
			options |= DIFF_SILENT_ON_REMOVED;
215 216
			i++;
		}
217 218
		else if (!strcmp(argv[i], "--"))
			i++;
219 220 221 222 223 224 225 226
		else {
			j = diff_opt_parse(&revs->diffopt, argv + i, argc - i);
			if (!j)
				die("invalid diff option/value: %s", argv[i]);
			i += j;
		}
	}

227 228 229 230 231 232 233
	/*
	 * If the user asked for our exit code then don't start a
	 * pager or we would end up reporting its exit code instead.
	 */
	if (!DIFF_OPT_TST(&revs->diffopt, EXIT_WITH_STATUS))
		setup_pager();

234 235
	if (prefix) {
		int len = strlen(prefix);
236 237
		const char *paths[3];
		memset(paths, 0, sizeof(paths));
238 239 240 241 242 243 244 245 246 247

		for (i = 0; i < 2; i++) {
			const char *p = argv[argc - 2 + i];
			/*
			 * stdin should be spelled as '-'; if you have
			 * path that is '-', spell it as ./-.
			 */
			p = (strcmp(p, "-")
			     ? xstrdup(prefix_filename(prefix, len, p))
			     : p);
248
			paths[i] = p;
249
		}
250
		diff_tree_setup_paths(paths, &revs->diffopt);
251 252
	}
	else
253
		diff_tree_setup_paths(argv + argc - 2, &revs->diffopt);
254
	revs->diffopt.skip_stat_unmatch = 1;
255 256
	if (!revs->diffopt.output_format)
		revs->diffopt.output_format = DIFF_FORMAT_PATCH;
257 258 259 260 261 262 263 264

	DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
	DIFF_OPT_SET(&revs->diffopt, NO_INDEX);

	revs->max_count = -2;
	if (diff_setup_done(&revs->diffopt) < 0)
		die("diff_setup_done failed");

265 266
	if (queue_diff(&revs->diffopt, revs->diffopt.pathspec.raw[0],
		       revs->diffopt.pathspec.raw[1]))
267
		exit(1);
268
	diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
269 270 271 272 273 274 275 276 277
	diffcore_std(&revs->diffopt);
	diff_flush(&revs->diffopt);

	/*
	 * The return code for --no-index imitates diff(1):
	 * 0 = no changes, 1 = changes, else error
	 */
	exit(revs->diffopt.found_changes);
}