[thirdparty/git.git] / diff-no-index.c

/*
 * "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 "parse-options.h"
#include "string-list.h"
#include "dir.h"

static int read_directory_contents(const char *path, struct string_list *list)
{
	DIR *dir;
	struct dirent *e;

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

	while ((e = readdir_skip_dot_and_dotdot(dir)))
		string_list_insert(list, e->d_name);

	closedir(dir);
	return 0;
}

/*
 * This should be "(standard input)" or something, but it will
 * probably expose many more breakages in the way no-index code
 * is bolted onto the diff callchain.
 */
static const char file_from_standard_input[] = "-";

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

	if (!path || !strcmp(path, "/dev/null"))
		*mode = 0;
#ifdef GIT_WINDOWS_NATIVE
	else if (!strcasecmp(path, "nul"))
		*mode = 0;
#endif
	else if (path == file_from_standard_input)
		*mode = create_ce_mode(0666);
	else if (lstat(path, &st))
		return error("Could not access '%s'", path);
	else
		*mode = st.st_mode;
	return 0;
}

static int populate_from_stdin(struct diff_filespec *s)
{
	struct strbuf buf = STRBUF_INIT;
	size_t size = 0;

	if (strbuf_read(&buf, 0, 0) < 0)
		return error_errno("error while reading from stdin");

	s->should_munmap = 0;
	s->data = strbuf_detach(&buf, &size);
	s->size = size;
	s->should_free = 1;
	s->is_stdin = 1;
	return 0;
}

static struct diff_filespec *noindex_filespec(const char *name, int mode)
{
	struct diff_filespec *s;

	if (!name)
		name = "/dev/null";
	s = alloc_filespec(name);
	fill_filespec(s, null_oid(), 0, mode);
	if (name == file_from_standard_input)
		populate_from_stdin(s);
	return s;
}

static int queue_diff(struct diff_options *o,
		      const char *name1, const char *name2)
{
	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)) {
		struct diff_filespec *d1, *d2;

		if (S_ISDIR(mode1)) {
			/* 2 is file that is created */
			d1 = noindex_filespec(NULL, 0);
			d2 = noindex_filespec(name2, mode2);
			name2 = NULL;
			mode2 = 0;
		} else {
			/* 1 is file that is deleted */
			d1 = noindex_filespec(name1, mode1);
			d2 = noindex_filespec(NULL, 0);
			name1 = NULL;
			mode1 = 0;
		}
		/* emit that file */
		diff_queue(&diff_queued_diff, d1, d2);

		/* and then let the entire directory be created or deleted */
	}

	if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
		struct strbuf buffer1 = STRBUF_INIT;
		struct strbuf buffer2 = STRBUF_INIT;
		struct string_list p1 = STRING_LIST_INIT_DUP;
		struct string_list p2 = STRING_LIST_INIT_DUP;
		int i1, i2, ret = 0;
		size_t len1 = 0, len2 = 0;

		if (name1 && read_directory_contents(name1, &p1))
			return -1;
		if (name2 && read_directory_contents(name2, &p2)) {
			string_list_clear(&p1, 0);
			return -1;
		}

		if (name1) {
			strbuf_addstr(&buffer1, name1);
			strbuf_complete(&buffer1, '/');
			len1 = buffer1.len;
		}

		if (name2) {
			strbuf_addstr(&buffer2, name2);
			strbuf_complete(&buffer2, '/');
			len2 = buffer2.len;
		}

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

			strbuf_setlen(&buffer1, len1);
			strbuf_setlen(&buffer2, len2);

			if (i1 == p1.nr)
				comp = 1;
			else if (i2 == p2.nr)
				comp = -1;
			else
				comp = strcmp(p1.items[i1].string, p2.items[i2].string);

			if (comp > 0)
				n1 = NULL;
			else {
				strbuf_addstr(&buffer1, p1.items[i1++].string);
				n1 = buffer1.buf;
			}

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

			ret = queue_diff(o, n1, n2);
		}
		string_list_clear(&p1, 0);
		string_list_clear(&p2, 0);
		strbuf_release(&buffer1);
		strbuf_release(&buffer2);

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

		if (o->flags.reverse_diff) {
			SWAP(mode1, mode2);
			SWAP(name1, name2);
		}

		d1 = noindex_filespec(name1, mode1);
		d2 = noindex_filespec(name2, mode2);
		diff_queue(&diff_queued_diff, d1, d2);
		return 0;
	}
}

/* append basename of F to D */
static void append_basename(struct strbuf *path, const char *dir, const char *file)
{
	const char *tail = strrchr(file, '/');

	strbuf_addstr(path, dir);
	while (path->len && path->buf[path->len - 1] == '/')
		path->len--;
	strbuf_addch(path, '/');
	strbuf_addstr(path, tail ? tail + 1 : file);
}

/*
 * DWIM "diff D F" into "diff D/F F" and "diff F D" into "diff F D/F"
 * Note that we append the basename of F to D/, so "diff a/b/file D"
 * becomes "diff a/b/file D/file", not "diff a/b/file D/a/b/file".
 */
static void fixup_paths(const char **path, struct strbuf *replacement)
{
	unsigned int isdir0, isdir1;

	if (path[0] == file_from_standard_input ||
	    path[1] == file_from_standard_input)
		return;
	isdir0 = is_directory(path[0]);
	isdir1 = is_directory(path[1]);
	if (isdir0 == isdir1)
		return;
	if (isdir0) {
		append_basename(replacement, path[0], path[1]);
		path[0] = replacement->buf;
	} else {
		append_basename(replacement, path[1], path[0]);
		path[1] = replacement->buf;
	}
}

static const char * const diff_no_index_usage[] = {
	N_("git diff --no-index [<options>] <path> <path>"),
	NULL
};

int diff_no_index(struct rev_info *revs,
		  int implicit_no_index,
		  int argc, const char **argv)
{
	int i, no_index;
	int ret = 1;
	const char *paths[2];
	char *to_free[ARRAY_SIZE(paths)] = { 0 };
	struct strbuf replacement = STRBUF_INIT;
	const char *prefix = revs->prefix;
	struct option no_index_options[] = {
		OPT_BOOL_F(0, "no-index", &no_index, "",
			   PARSE_OPT_NONEG | PARSE_OPT_HIDDEN),
		OPT_END(),
	};
	struct option *options;

	options = add_diff_options(no_index_options, &revs->diffopt);
	argc = parse_options(argc, argv, revs->prefix, options,
			     diff_no_index_usage, 0);
	if (argc != 2) {
		if (implicit_no_index)
			warning(_("Not a git repository. Use --no-index to "
				  "compare two paths outside a working tree"));
		usage_with_options(diff_no_index_usage, options);
	}
	FREE_AND_NULL(options);
	for (i = 0; i < 2; i++) {
		const char *p = argv[i];
		if (!strcmp(p, "-"))
			/*
			 * stdin should be spelled as "-"; if you have
			 * path that is "-", spell it as "./-".
			 */
			p = file_from_standard_input;
		else if (prefix)
			p = to_free[i] = prefix_filename(prefix, p);
		paths[i] = p;
	}

	fixup_paths(paths, &replacement);

	revs->diffopt.skip_stat_unmatch = 1;
	if (!revs->diffopt.output_format)
		revs->diffopt.output_format = DIFF_FORMAT_PATCH;

	revs->diffopt.flags.no_index = 1;

	revs->diffopt.flags.relative_name = 1;
	revs->diffopt.prefix = prefix;

	revs->max_count = -2;
	diff_setup_done(&revs->diffopt);

	setup_diff_pager(&revs->diffopt);
	revs->diffopt.flags.exit_with_status = 1;

	if (queue_diff(&revs->diffopt, paths[0], paths[1]))
		goto out;
	diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
	diffcore_std(&revs->diffopt);
	diff_flush(&revs->diffopt);

	/*
	 * The return code for --no-index imitates diff(1):
	 * 0 = no changes, 1 = changes, else error
	 */
	ret = diff_result_code(&revs->diffopt, 0);

out:
	for (i = 0; i < ARRAY_SIZE(to_free); i++)
		free(to_free[i]);
	strbuf_release(&replacement);
	return ret;
}
Commit	Line	Data
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"
16bb3d71	16	#include "parse-options.h"
c455c87c	17	#include "string-list.h"
fd3aeeab	18	#include "dir.h"
0569e9b8	19
9daf0ef0	20	static int read_directory_contents(const char path, struct string_list list)
0569e9b8 JH	21	{
	22	DIR *dir;
	23	struct dirent *e;
	24
	25	if (!(dir = opendir(path)))
	26	return error("Could not open directory %s", path);
	27
b548f0f1 EN	28	while ((e = readdir_skip_dot_and_dotdot(dir)))
b548f0f1 EN	29	string_list_insert(list, e->d_name);
0569e9b8 JH	30
	31	closedir(dir);
	32	return 0;
	33	}
	34
4682d852 JH	35	/*
	36	* This should be "(standard input)" or something, but it will
	37	* probably expose many more breakages in the way no-index code
	38	* is bolted onto the diff callchain.
	39	*/
	40	static const char file_from_standard_input[] = "-";
	41
0569e9b8 JH	42	static int get_mode(const char path, int mode)
	43	{
	44	struct stat st;
	45
	46	if (!path \|\| !strcmp(path, "/dev/null"))
	47	*mode = 0;
380395d0	48	#ifdef GIT_WINDOWS_NATIVE
36adb4ab JS	49	else if (!strcasecmp(path, "nul"))
	50	*mode = 0;
	51	#endif
4682d852	52	else if (path == file_from_standard_input)
0569e9b8	53	*mode = create_ce_mode(0666);
418566b6	54	else if (lstat(path, &st))
0569e9b8 JH	55	return error("Could not access '%s'", path);
	56	else
	57	*mode = st.st_mode;
	58	return 0;
	59	}
	60
4682d852 JH	61	static int populate_from_stdin(struct diff_filespec *s)
	62	{
	63	struct strbuf buf = STRBUF_INIT;
	64	size_t size = 0;
	65
	66	if (strbuf_read(&buf, 0, 0) < 0)
a1f06be3	67	return error_errno("error while reading from stdin");
4682d852 JH	68
	69	s->should_munmap = 0;
	70	s->data = strbuf_detach(&buf, &size);
	71	s->size = size;
	72	s->should_free = 1;
	73	s->is_stdin = 1;
	74	return 0;
	75	}
	76
	77	static struct diff_filespec noindex_filespec(const char name, int mode)
	78	{
	79	struct diff_filespec *s;
	80
	81	if (!name)
	82	name = "/dev/null";
	83	s = alloc_filespec(name);
14228447	84	fill_filespec(s, null_oid(), 0, mode);
4682d852 JH	85	if (name == file_from_standard_input)
	86	populate_from_stdin(s);
	87	return s;
	88	}
	89
0569e9b8	90	static int queue_diff(struct diff_options *o,
875b91b3	91	const char name1, const char name2)
0569e9b8 JH	92	{
	93	int mode1 = 0, mode2 = 0;
	94
	95	if (get_mode(name1, &mode1) \|\| get_mode(name2, &mode2))
	96	return -1;
	97
06151739 JH	98	if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2)) {
	99	struct diff_filespec d1, d2;
	100
	101	if (S_ISDIR(mode1)) {
	102	/* 2 is file that is created */
	103	d1 = noindex_filespec(NULL, 0);
	104	d2 = noindex_filespec(name2, mode2);
	105	name2 = NULL;
	106	mode2 = 0;
	107	} else {
	108	/* 1 is file that is deleted */
	109	d1 = noindex_filespec(name1, mode1);
	110	d2 = noindex_filespec(NULL, 0);
	111	name1 = NULL;
	112	mode1 = 0;
	113	}
	114	/* emit that file */
	115	diff_queue(&diff_queued_diff, d1, d2);
	116
	117	/* and then let the entire directory be created or deleted */
	118	}
0569e9b8 JH	119
0569e9b8 JH	120	if (S_ISDIR(mode1) \|\| S_ISDIR(mode2)) {
875b91b3 JH	121	struct strbuf buffer1 = STRBUF_INIT;
875b91b3 JH	122	struct strbuf buffer2 = STRBUF_INIT;
183113a5 TF	123	struct string_list p1 = STRING_LIST_INIT_DUP;
183113a5 TF	124	struct string_list p2 = STRING_LIST_INIT_DUP;
875b91b3	125	int i1, i2, ret = 0;
f3999e03	126	size_t len1 = 0, len2 = 0;
0569e9b8	127
9daf0ef0	128	if (name1 && read_directory_contents(name1, &p1))
0569e9b8	129	return -1;
9daf0ef0	130	if (name2 && read_directory_contents(name2, &p2)) {
c455c87c	131	string_list_clear(&p1, 0);
0569e9b8 JH	132	return -1;
	133	}
	134
	135	if (name1) {
875b91b3	136	strbuf_addstr(&buffer1, name1);
00b6c178	137	strbuf_complete(&buffer1, '/');
f3999e03	138	len1 = buffer1.len;
0569e9b8 JH	139	}
	140
	141	if (name2) {
875b91b3	142	strbuf_addstr(&buffer2, name2);
00b6c178	143	strbuf_complete(&buffer2, '/');
f3999e03	144	len2 = buffer2.len;
0569e9b8 JH	145	}
	146
	147	for (i1 = i2 = 0; !ret && (i1 < p1.nr \|\| i2 < p2.nr); ) {
	148	const char n1, n2;
	149	int comp;
	150
f3999e03 BP	151	strbuf_setlen(&buffer1, len1);
	152	strbuf_setlen(&buffer2, len2);
	153
0569e9b8 JH	154	if (i1 == p1.nr)
	155	comp = 1;
	156	else if (i2 == p2.nr)
	157	comp = -1;
	158	else
875b91b3	159	comp = strcmp(p1.items[i1].string, p2.items[i2].string);
0569e9b8 JH	160
	161	if (comp > 0)
	162	n1 = NULL;
	163	else {
875b91b3 JH	164	strbuf_addstr(&buffer1, p1.items[i1++].string);
875b91b3 JH	165	n1 = buffer1.buf;
0569e9b8 JH	166	}
	167
	168	if (comp < 0)
	169	n2 = NULL;
	170	else {
875b91b3 JH	171	strbuf_addstr(&buffer2, p2.items[i2++].string);
875b91b3 JH	172	n2 = buffer2.buf;
0569e9b8 JH	173	}
	174
	175	ret = queue_diff(o, n1, n2);
	176	}
c455c87c JS	177	string_list_clear(&p1, 0);
c455c87c JS	178	string_list_clear(&p2, 0);
176a3354 BP	179	strbuf_release(&buffer1);
176a3354 BP	180	strbuf_release(&buffer2);
0569e9b8 JH	181
	182	return ret;
	183	} else {
	184	struct diff_filespec d1, d2;
	185
0d1e0e78	186	if (o->flags.reverse_diff) {
402bf8e1	187	SWAP(mode1, mode2);
35d803bc	188	SWAP(name1, name2);
0569e9b8 JH	189	}
0569e9b8 JH	190
4682d852 JH	191	d1 = noindex_filespec(name1, mode1);
4682d852 JH	192	d2 = noindex_filespec(name2, mode2);
0569e9b8 JH	193	diff_queue(&diff_queued_diff, d1, d2);
	194	return 0;
	195	}
	196	}
	197
c9e1f2c7 JH	198	/* append basename of F to D */
	199	static void append_basename(struct strbuf path, const char dir, const char *file)
	200	{
	201	const char *tail = strrchr(file, '/');
	202
	203	strbuf_addstr(path, dir);
	204	while (path->len && path->buf[path->len - 1] == '/')
	205	path->len--;
	206	strbuf_addch(path, '/');
	207	strbuf_addstr(path, tail ? tail + 1 : file);
	208	}
	209
	210	/*
	211	* DWIM "diff D F" into "diff D/F F" and "diff F D" into "diff F D/F"
	212	* Note that we append the basename of F to D/, so "diff a/b/file D"
	213	* becomes "diff a/b/file D/file", not "diff a/b/file D/a/b/file".
	214	*/
	215	static void fixup_paths(const char *path, struct strbuf replacement)
	216	{
	217	unsigned int isdir0, isdir1;
	218
	219	if (path[0] == file_from_standard_input \|\|
	220	path[1] == file_from_standard_input)
	221	return;
	222	isdir0 = is_directory(path[0]);
	223	isdir1 = is_directory(path[1]);
	224	if (isdir0 == isdir1)
	225	return;
	226	if (isdir0) {
	227	append_basename(replacement, path[0], path[1]);
	228	path[0] = replacement->buf;
	229	} else {
	230	append_basename(replacement, path[1], path[0]);
	231	path[1] = replacement->buf;
	232	}
	233	}
	234
16bb3d71 NTND	235	static const char * const diff_no_index_usage[] = {
	236	N_("git diff --no-index [<options>] <path> <path>"),
	237	NULL
	238	};
	239
dcd6a8c0	240	int diff_no_index(struct rev_info *revs,
16bb3d71 NTND	241	int implicit_no_index,
16bb3d71 NTND	242	int argc, const char **argv)
0569e9b8	243	{
16bb3d71	244	int i, no_index;
fffe7d81	245	int ret = 1;
c20f5926	246	const char *paths[2];
07a6f94a	247	char *to_free[ARRAY_SIZE(paths)] = { 0 };
c9e1f2c7	248	struct strbuf replacement = STRBUF_INIT;
e5f7a5d1	249	const char *prefix = revs->prefix;
16bb3d71 NTND	250	struct option no_index_options[] = {
	251	OPT_BOOL_F(0, "no-index", &no_index, "",
	252	PARSE_OPT_NONEG \| PARSE_OPT_HIDDEN),
	253	OPT_END(),
	254	};
	255	struct option *options;
0569e9b8	256
c5630c48	257	options = add_diff_options(no_index_options, &revs->diffopt);
16bb3d71 NTND	258	argc = parse_options(argc, argv, revs->prefix, options,
	259	diff_no_index_usage, 0);
	260	if (argc != 2) {
	261	if (implicit_no_index)
	262	warning(_("Not a git repository. Use --no-index to "
	263	"compare two paths outside a working tree"));
	264	usage_with_options(diff_no_index_usage, options);
0569e9b8	265	}
16bb3d71	266	FREE_AND_NULL(options);
3b069b1b	267	for (i = 0; i < 2; i++) {
2b43dd0e	268	const char *p = argv[i];
3b069b1b	269	if (!strcmp(p, "-"))
0569e9b8	270	/*
3b069b1b JH	271	* stdin should be spelled as "-"; if you have
3b069b1b JH	272	* path that is "-", spell it as "./-".
0569e9b8	273	*/
4682d852	274	p = file_from_standard_input;
116fb64e	275	else if (prefix)
07a6f94a	276	p = to_free[i] = prefix_filename(prefix, p);
3b069b1b	277	paths[i] = p;
0569e9b8	278	}
c9e1f2c7 JH	279
	280	fixup_paths(paths, &replacement);
	281
d61027b2	282	revs->diffopt.skip_stat_unmatch = 1;
5d83f9c1 JS	283	if (!revs->diffopt.output_format)
5d83f9c1 JS	284	revs->diffopt.output_format = DIFF_FORMAT_PATCH;
0569e9b8	285
0d1e0e78	286	revs->diffopt.flags.no_index = 1;
0569e9b8	287
0d1e0e78	288	revs->diffopt.flags.relative_name = 1;
7d8930d9 JK	289	revs->diffopt.prefix = prefix;
7d8930d9 JK	290
0569e9b8	291	revs->max_count = -2;
28452655	292	diff_setup_done(&revs->diffopt);
0569e9b8	293
af63b543	294	setup_diff_pager(&revs->diffopt);
0d1e0e78	295	revs->diffopt.flags.exit_with_status = 1;
af63b543	296
c20f5926	297	if (queue_diff(&revs->diffopt, paths[0], paths[1]))
fffe7d81	298	goto out;
a5a818ee	299	diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
0569e9b8 JH	300	diffcore_std(&revs->diffopt);
	301	diff_flush(&revs->diffopt);
	302
	303	/*
	304	* The return code for --no-index imitates diff(1):
	305	* 0 = no changes, 1 = changes, else error
	306	*/
fffe7d81 RS	307	ret = diff_result_code(&revs->diffopt, 0);
	308
	309	out:
07a6f94a RS	310	for (i = 0; i < ARRAY_SIZE(to_free); i++)
07a6f94a RS	311	free(to_free[i]);
fffe7d81 RS	312	strbuf_release(&replacement);
fffe7d81 RS	313	return ret;
0569e9b8	314	}