[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 "builtin.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(dir)))
		if (!is_dot_or_dotdot(e->d_name))
			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;
	}
}

void diff_no_index(struct rev_info *revs,
		   int argc, const char **argv)
{
	int i;
	const char *paths[2];
	struct strbuf replacement = STRBUF_INIT;
	const char *prefix = revs->prefix;

	diff_setup(&revs->diffopt);
	for (i = 1; i < argc - 2; ) {
		int j;
		if (!strcmp(argv[i], "--no-index"))
			i++;
		else if (!strcmp(argv[i], "--"))
			i++;
		else {
			j = diff_opt_parse(&revs->diffopt, argv + i, argc - i,
					   revs->prefix);
			if (j <= 0)
				die("invalid diff option/value: %s", argv[i]);
			i += j;
		}
	}

	for (i = 0; i < 2; i++) {
		const char *p = argv[argc - 2 + 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 = 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]))
		exit(1);
	diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
	diffcore_std(&revs->diffopt);
	diff_flush(&revs->diffopt);

	strbuf_release(&replacement);

	/*
	 * The return code for --no-index imitates diff(1):
	 * 0 = no changes, 1 = changes, else error
	 */
	exit(diff_result_code(&revs->diffopt, 0));
}
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"
	16	#include "builtin.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
	28	while ((e = readdir(dir)))
fd3aeeab	29	if (!is_dot_or_dotdot(e->d_name))
78a395d3	30	string_list_insert(list, e->d_name);
0569e9b8 JH	31
	32	closedir(dir);
	33	return 0;
	34	}
	35
4682d852 JH	36	/*
	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	*/
	41	static const char file_from_standard_input[] = "-";
	42
0569e9b8 JH	43	static int get_mode(const char path, int mode)
	44	{
	45	struct stat st;
	46
	47	if (!path \|\| !strcmp(path, "/dev/null"))
	48	*mode = 0;
380395d0	49	#ifdef GIT_WINDOWS_NATIVE
36adb4ab JS	50	else if (!strcasecmp(path, "nul"))
	51	*mode = 0;
	52	#endif
4682d852	53	else if (path == file_from_standard_input)
0569e9b8	54	*mode = create_ce_mode(0666);
418566b6	55	else if (lstat(path, &st))
0569e9b8 JH	56	return error("Could not access '%s'", path);
	57	else
	58	*mode = st.st_mode;
	59	return 0;
	60	}
	61
4682d852 JH	62	static 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)
a1f06be3	68	return error_errno("error while reading from stdin");
4682d852 JH	69
	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
	78	static 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);
f9704c2d	85	fill_filespec(s, &null_oid, 0, mode);
4682d852 JH	86	if (name == file_from_standard_input)
	87	populate_from_stdin(s);
	88	return s;
	89	}
	90
0569e9b8	91	static int queue_diff(struct diff_options *o,
875b91b3	92	const char name1, const char name2)
0569e9b8 JH	93	{
	94	int mode1 = 0, mode2 = 0;
	95
	96	if (get_mode(name1, &mode1) \|\| get_mode(name2, &mode2))
	97	return -1;
	98
06151739 JH	99	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	}
0569e9b8 JH	120
0569e9b8 JH	121	if (S_ISDIR(mode1) \|\| S_ISDIR(mode2)) {
875b91b3 JH	122	struct strbuf buffer1 = STRBUF_INIT;
875b91b3 JH	123	struct strbuf buffer2 = STRBUF_INIT;
183113a5 TF	124	struct string_list p1 = STRING_LIST_INIT_DUP;
183113a5 TF	125	struct string_list p2 = STRING_LIST_INIT_DUP;
875b91b3	126	int i1, i2, ret = 0;
f3999e03	127	size_t len1 = 0, len2 = 0;
0569e9b8	128
9daf0ef0	129	if (name1 && read_directory_contents(name1, &p1))
0569e9b8	130	return -1;
9daf0ef0	131	if (name2 && read_directory_contents(name2, &p2)) {
c455c87c	132	string_list_clear(&p1, 0);
0569e9b8 JH	133	return -1;
	134	}
	135
	136	if (name1) {
875b91b3	137	strbuf_addstr(&buffer1, name1);
00b6c178	138	strbuf_complete(&buffer1, '/');
f3999e03	139	len1 = buffer1.len;
0569e9b8 JH	140	}
	141
	142	if (name2) {
875b91b3	143	strbuf_addstr(&buffer2, name2);
00b6c178	144	strbuf_complete(&buffer2, '/');
f3999e03	145	len2 = buffer2.len;
0569e9b8 JH	146	}
	147
	148	for (i1 = i2 = 0; !ret && (i1 < p1.nr \|\| i2 < p2.nr); ) {
	149	const char n1, n2;
	150	int comp;
	151
f3999e03 BP	152	strbuf_setlen(&buffer1, len1);
	153	strbuf_setlen(&buffer2, len2);
	154
0569e9b8 JH	155	if (i1 == p1.nr)
	156	comp = 1;
	157	else if (i2 == p2.nr)
	158	comp = -1;
	159	else
875b91b3	160	comp = strcmp(p1.items[i1].string, p2.items[i2].string);
0569e9b8 JH	161
	162	if (comp > 0)
	163	n1 = NULL;
	164	else {
875b91b3 JH	165	strbuf_addstr(&buffer1, p1.items[i1++].string);
875b91b3 JH	166	n1 = buffer1.buf;
0569e9b8 JH	167	}
	168
	169	if (comp < 0)
	170	n2 = NULL;
	171	else {
875b91b3 JH	172	strbuf_addstr(&buffer2, p2.items[i2++].string);
875b91b3 JH	173	n2 = buffer2.buf;
0569e9b8 JH	174	}
	175
	176	ret = queue_diff(o, n1, n2);
	177	}
c455c87c JS	178	string_list_clear(&p1, 0);
c455c87c JS	179	string_list_clear(&p2, 0);
176a3354 BP	180	strbuf_release(&buffer1);
176a3354 BP	181	strbuf_release(&buffer2);
0569e9b8 JH	182
	183	return ret;
	184	} else {
	185	struct diff_filespec d1, d2;
	186
0d1e0e78	187	if (o->flags.reverse_diff) {
402bf8e1	188	SWAP(mode1, mode2);
35d803bc	189	SWAP(name1, name2);
0569e9b8 JH	190	}
0569e9b8 JH	191
4682d852 JH	192	d1 = noindex_filespec(name1, mode1);
4682d852 JH	193	d2 = noindex_filespec(name2, mode2);
0569e9b8 JH	194	diff_queue(&diff_queued_diff, d1, d2);
	195	return 0;
	196	}
	197	}
	198
c9e1f2c7 JH	199	/* append basename of F to D */
	200	static 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	*/
	216	static 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
0569e9b8	236	void diff_no_index(struct rev_info *revs,
e5f7a5d1	237	int argc, const char **argv)
0569e9b8	238	{
116fb64e	239	int i;
c20f5926	240	const char *paths[2];
c9e1f2c7	241	struct strbuf replacement = STRBUF_INIT;
e5f7a5d1	242	const char *prefix = revs->prefix;
0569e9b8	243
0569e9b8	244	diff_setup(&revs->diffopt);
0569e9b8 JH	245	for (i = 1; i < argc - 2; ) {
	246	int j;
	247	if (!strcmp(argv[i], "--no-index"))
	248	i++;
e423ffd8 TR	249	else if (!strcmp(argv[i], "--"))
e423ffd8 TR	250	i++;
0569e9b8	251	else {
a97262c6 NTND	252	j = diff_opt_parse(&revs->diffopt, argv + i, argc - i,
a97262c6 NTND	253	revs->prefix);
ad1c3fbd	254	if (j <= 0)
0569e9b8 JH	255	die("invalid diff option/value: %s", argv[i]);
	256	i += j;
	257	}
	258	}
	259
3b069b1b JH	260	for (i = 0; i < 2; i++) {
	261	const char *p = argv[argc - 2 + i];
	262	if (!strcmp(p, "-"))
0569e9b8	263	/*
3b069b1b JH	264	* stdin should be spelled as "-"; if you have
3b069b1b JH	265	* path that is "-", spell it as "./-".
0569e9b8	266	*/
4682d852	267	p = file_from_standard_input;
116fb64e	268	else if (prefix)
e4da43b1	269	p = prefix_filename(prefix, p);
3b069b1b	270	paths[i] = p;
0569e9b8	271	}
c9e1f2c7 JH	272
	273	fixup_paths(paths, &replacement);
	274
d61027b2	275	revs->diffopt.skip_stat_unmatch = 1;
5d83f9c1 JS	276	if (!revs->diffopt.output_format)
5d83f9c1 JS	277	revs->diffopt.output_format = DIFF_FORMAT_PATCH;
0569e9b8	278
0d1e0e78	279	revs->diffopt.flags.no_index = 1;
0569e9b8	280
0d1e0e78	281	revs->diffopt.flags.relative_name = 1;
7d8930d9 JK	282	revs->diffopt.prefix = prefix;
7d8930d9 JK	283
0569e9b8	284	revs->max_count = -2;
28452655	285	diff_setup_done(&revs->diffopt);
0569e9b8	286
af63b543	287	setup_diff_pager(&revs->diffopt);
0d1e0e78	288	revs->diffopt.flags.exit_with_status = 1;
af63b543	289
c20f5926	290	if (queue_diff(&revs->diffopt, paths[0], paths[1]))
0569e9b8	291	exit(1);
a5a818ee	292	diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
0569e9b8 JH	293	diffcore_std(&revs->diffopt);
	294	diff_flush(&revs->diffopt);
	295
c9e1f2c7 JH	296	strbuf_release(&replacement);
c9e1f2c7 JH	297
0569e9b8 JH	298	/*
	299	* The return code for --no-index imitates diff(1):
	300	* 0 = no changes, 1 = changes, else error
	301	*/
304970dd	302	exit(diff_result_code(&revs->diffopt, 0));
0569e9b8	303	}