[thirdparty/git.git] / tree-diff.c

/*
 * Helper functions for tree diff generation
 */
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
#include "tree.h"


static int ll_diff_tree_sha1(const unsigned char *old, const unsigned char *new,
			     const char *base_str, struct diff_options *opt);

/*
 * Compare two tree entries, taking into account only path/S_ISDIR(mode),
 * but not their sha1's.
 *
 * NOTE files and directories *always* compare differently, even when having
 *      the same name - thanks to base_name_compare().
 *
 * NOTE empty (=invalid) descriptor(s) take part in comparison as +infty,
 *      so that they sort *after* valid tree entries.
 *
 *      Due to this convention, if trees are scanned in sorted order, all
 *      non-empty descriptors will be processed first.
 */
static int tree_entry_pathcmp(struct tree_desc *t1, struct tree_desc *t2)
{
	struct name_entry *e1, *e2;
	int cmp;

	/* empty descriptors sort after valid tree entries */
	if (!t1->size)
		return t2->size ? 1 : 0;
	else if (!t2->size)
		return -1;

	e1 = &t1->entry;
	e2 = &t2->entry;
	cmp = base_name_compare(e1->path, tree_entry_len(e1), e1->mode,
				e2->path, tree_entry_len(e2), e2->mode);
	return cmp;
}


/* convert path, t1/t2 -> opt->diff_*() callbacks */
static void emit_diff(struct diff_options *opt, struct strbuf *path,
		      struct tree_desc *t1, struct tree_desc *t2)
{
	unsigned int mode1 = t1 ? t1->entry.mode : 0;
	unsigned int mode2 = t2 ? t2->entry.mode : 0;

	if (mode1 && mode2) {
		opt->change(opt, mode1, mode2, t1->entry.sha1, t2->entry.sha1,
			1, 1, path->buf, 0, 0);
	}
	else {
		const unsigned char *sha1;
		unsigned int mode;
		int addremove;

		if (mode2) {
			addremove = '+';
			sha1 = t2->entry.sha1;
			mode = mode2;
		} else {
			addremove = '-';
			sha1 = t1->entry.sha1;
			mode = mode1;
		}

		opt->add_remove(opt, addremove, mode, sha1, 1, path->buf, 0);
	}
}


/* new path should be added to diff
 *
 * 3 cases on how/when it should be called and behaves:
 *
 *	!t1,  t2	-> path added, parent lacks it
 *	 t1, !t2	-> path removed from parent
 *	 t1,  t2	-> path modified
 */
static void show_path(struct strbuf *base, struct diff_options *opt,
		      struct tree_desc *t1, struct tree_desc *t2)
{
	unsigned mode;
	const char *path;
	int pathlen;
	int old_baselen = base->len;
	int isdir, recurse = 0, emitthis = 1;

	/* at least something has to be valid */
	assert(t1 || t2);

	if (t2) {
		/* path present in resulting tree */
		tree_entry_extract(t2, &path, &mode);
		pathlen = tree_entry_len(&t2->entry);
		isdir = S_ISDIR(mode);
	} else {
		/*
		 * a path was removed - take path from parent. Also take
		 * mode from parent, to decide on recursion.
		 */
		tree_entry_extract(t1, &path, &mode);
		pathlen = tree_entry_len(&t1->entry);

		isdir = S_ISDIR(mode);
		mode = 0;
	}

	if (DIFF_OPT_TST(opt, RECURSIVE) && isdir) {
		recurse = 1;
		emitthis = DIFF_OPT_TST(opt, TREE_IN_RECURSIVE);
	}

	strbuf_add(base, path, pathlen);

	if (emitthis)
		emit_diff(opt, base, t1, t2);

	if (recurse) {
		strbuf_addch(base, '/');
		ll_diff_tree_sha1(t1 ? t1->entry.sha1 : NULL,
				  t2 ? t2->entry.sha1 : NULL, base->buf, opt);
	}

	strbuf_setlen(base, old_baselen);
}

static void skip_uninteresting(struct tree_desc *t, struct strbuf *base,
			       struct diff_options *opt)
{
	enum interesting match;

	while (t->size) {
		match = tree_entry_interesting(&t->entry, base, 0, &opt->pathspec);
		if (match) {
			if (match == all_entries_not_interesting)
				t->size = 0;
			break;
		}
		update_tree_entry(t);
	}
}

static int ll_diff_tree_sha1(const unsigned char *old, const unsigned char *new,
			     const char *base_str, struct diff_options *opt)
{
	struct tree_desc t1, t2;
	void *t1tree, *t2tree;
	struct strbuf base;
	int baselen = strlen(base_str);

	t1tree = fill_tree_descriptor(&t1, old);
	t2tree = fill_tree_descriptor(&t2, new);

	/* Enable recursion indefinitely */
	opt->pathspec.recursive = DIFF_OPT_TST(opt, RECURSIVE);

	strbuf_init(&base, PATH_MAX);
	strbuf_add(&base, base_str, baselen);

	for (;;) {
		int cmp;

		if (diff_can_quit_early(opt))
			break;
		if (opt->pathspec.nr) {
			skip_uninteresting(&t1, &base, opt);
			skip_uninteresting(&t2, &base, opt);
		}
		if (!t1.size && !t2.size)
			break;

		cmp = tree_entry_pathcmp(&t1, &t2);

		/* t1 = t2 */
		if (cmp == 0) {
			if (DIFF_OPT_TST(opt, FIND_COPIES_HARDER) ||
			    hashcmp(t1.entry.sha1, t2.entry.sha1) ||
			    (t1.entry.mode != t2.entry.mode))
				show_path(&base, opt, &t1, &t2);

			update_tree_entry(&t1);
			update_tree_entry(&t2);
		}

		/* t1 < t2 */
		else if (cmp < 0) {
			show_path(&base, opt, &t1, /*t2=*/NULL);
			update_tree_entry(&t1);
		}

		/* t1 > t2 */
		else {
			show_path(&base, opt, /*t1=*/NULL, &t2);
			update_tree_entry(&t2);
		}
	}

	strbuf_release(&base);
	free(t2tree);
	free(t1tree);
	return 0;
}

/*
 * Does it look like the resulting diff might be due to a rename?
 *  - single entry
 *  - not a valid previous file
 */
static inline int diff_might_be_rename(void)
{
	return diff_queued_diff.nr == 1 &&
		!DIFF_FILE_VALID(diff_queued_diff.queue[0]->one);
}

static void try_to_follow_renames(const unsigned char *old, const unsigned char *new, const char *base, struct diff_options *opt)
{
	struct diff_options diff_opts;
	struct diff_queue_struct *q = &diff_queued_diff;
	struct diff_filepair *choice;
	int i;

	/*
	 * follow-rename code is very specific, we need exactly one
	 * path. Magic that matches more than one path is not
	 * supported.
	 */
	GUARD_PATHSPEC(&opt->pathspec, PATHSPEC_FROMTOP | PATHSPEC_LITERAL);
#if 0
	/*
	 * We should reject wildcards as well. Unfortunately we
	 * haven't got a reliable way to detect that 'foo\*bar' in
	 * fact has no wildcards. nowildcard_len is merely a hint for
	 * optimization. Let it slip for now until wildmatch is taught
	 * about dry-run mode and returns wildcard info.
	 */
	if (opt->pathspec.has_wildcard)
		die("BUG:%s:%d: wildcards are not supported",
		    __FILE__, __LINE__);
#endif

	/* Remove the file creation entry from the diff queue, and remember it */
	choice = q->queue[0];
	q->nr = 0;

	diff_setup(&diff_opts);
	DIFF_OPT_SET(&diff_opts, RECURSIVE);
	DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER);
	diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
	diff_opts.single_follow = opt->pathspec.items[0].match;
	diff_opts.break_opt = opt->break_opt;
	diff_opts.rename_score = opt->rename_score;
	diff_setup_done(&diff_opts);
	ll_diff_tree_sha1(old, new, base, &diff_opts);
	diffcore_std(&diff_opts);
	free_pathspec(&diff_opts.pathspec);

	/* Go through the new set of filepairing, and see if we find a more interesting one */
	opt->found_follow = 0;
	for (i = 0; i < q->nr; i++) {
		struct diff_filepair *p = q->queue[i];

		/*
		 * Found a source? Not only do we use that for the new
		 * diff_queued_diff, we will also use that as the path in
		 * the future!
		 */
		if ((p->status == 'R' || p->status == 'C') &&
		    !strcmp(p->two->path, opt->pathspec.items[0].match)) {
			const char *path[2];

			/* Switch the file-pairs around */
			q->queue[i] = choice;
			choice = p;

			/* Update the path we use from now on.. */
			path[0] = p->one->path;
			path[1] = NULL;
			free_pathspec(&opt->pathspec);
			parse_pathspec(&opt->pathspec,
				       PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
				       PATHSPEC_LITERAL_PATH, "", path);

			/*
			 * The caller expects us to return a set of vanilla
			 * filepairs to let a later call to diffcore_std()
			 * it makes to sort the renames out (among other
			 * things), but we already have found renames
			 * ourselves; signal diffcore_std() not to muck with
			 * rename information.
			 */
			opt->found_follow = 1;
			break;
		}
	}

	/*
	 * Then, discard all the non-relevant file pairs...
	 */
	for (i = 0; i < q->nr; i++) {
		struct diff_filepair *p = q->queue[i];
		diff_free_filepair(p);
	}

	/*
	 * .. and re-instate the one we want (which might be either the
	 * original one, or the rename/copy we found)
	 */
	q->queue[0] = choice;
	q->nr = 1;
}

int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base, struct diff_options *opt)
{
	int retval;

	retval = ll_diff_tree_sha1(old, new, base, opt);
	if (!*base && DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename())
		try_to_follow_renames(old, new, base, opt);

	return retval;
}

int diff_root_tree_sha1(const unsigned char *new, const char *base, struct diff_options *opt)
{
	return diff_tree_sha1(NULL, new, base, opt);
}
Commit	Line	Data
ac1b3d12 LT	1	/*
	2	* Helper functions for tree diff generation
	3	*/
	4	#include "cache.h"
	5	#include "diff.h"
750f7b66	6	#include "diffcore.h"
8e440259	7	#include "tree.h"
ac1b3d12	8
b9081a65 KS	9
	10	static int ll_diff_tree_sha1(const unsigned char old, const unsigned char new,
	11	const char base_str, struct diff_options opt);
	12
9bc06196 KS	13	/*
	14	* Compare two tree entries, taking into account only path/S_ISDIR(mode),
	15	* but not their sha1's.
	16	*
	17	* NOTE files and directories always compare differently, even when having
	18	* the same name - thanks to base_name_compare().
6ca844e9 KS	19	*
	20	* NOTE empty (=invalid) descriptor(s) take part in comparison as +infty,
	21	* so that they sort after valid tree entries.
	22	*
	23	* Due to this convention, if trees are scanned in sorted order, all
	24	* non-empty descriptors will be processed first.
9bc06196 KS	25	*/
9bc06196 KS	26	static int tree_entry_pathcmp(struct tree_desc t1, struct tree_desc t2)
ac1b3d12	27	{
1a27a154 KS	28	struct name_entry e1, e2;
1a27a154 KS	29	int cmp;
ac1b3d12	30
6ca844e9 KS	31	/* empty descriptors sort after valid tree entries */
	32	if (!t1->size)
	33	return t2->size ? 1 : 0;
	34	else if (!t2->size)
	35	return -1;
	36
1a27a154 KS	37	e1 = &t1->entry;
	38	e2 = &t2->entry;
	39	cmp = base_name_compare(e1->path, tree_entry_len(e1), e1->mode,
	40	e2->path, tree_entry_len(e2), e2->mode);
903bba68	41	return cmp;
d00e980c KS	42	}
	43
	44
	45	/* convert path, t1/t2 -> opt->diff_() callbacks /
	46	static void emit_diff(struct diff_options opt, struct strbuf path,
	47	struct tree_desc t1, struct tree_desc t2)
	48	{
	49	unsigned int mode1 = t1 ? t1->entry.mode : 0;
	50	unsigned int mode2 = t2 ? t2->entry.mode : 0;
	51
	52	if (mode1 && mode2) {
	53	opt->change(opt, mode1, mode2, t1->entry.sha1, t2->entry.sha1,
	54	1, 1, path->buf, 0, 0);
	55	}
	56	else {
	57	const unsigned char *sha1;
	58	unsigned int mode;
	59	int addremove;
	60
	61	if (mode2) {
	62	addremove = '+';
	63	sha1 = t2->entry.sha1;
	64	mode = mode2;
	65	} else {
	66	addremove = '-';
	67	sha1 = t1->entry.sha1;
	68	mode = mode1;
fd55a19e	69	}
d00e980c KS	70
d00e980c KS	71	opt->add_remove(opt, addremove, mode, sha1, 1, path->buf, 0);
ac1b3d12	72	}
ac1b3d12 LT	73	}
ac1b3d12 LT	74
d00e980c KS	75
	76	/* new path should be added to diff
	77	*
	78	* 3 cases on how/when it should be called and behaves:
	79	*
	80	* !t1, t2 -> path added, parent lacks it
	81	* t1, !t2 -> path removed from parent
	82	* t1, t2 -> path modified
	83	*/
	84	static void show_path(struct strbuf base, struct diff_options opt,
	85	struct tree_desc t1, struct tree_desc t2)
ac1b3d12 LT	86	{
	87	unsigned mode;
	88	const char *path;
d00e980c	89	int pathlen;
48932677	90	int old_baselen = base->len;
d00e980c KS	91	int isdir, recurse = 0, emitthis = 1;
	92
	93	/* at least something has to be valid */
	94	assert(t1 \|\| t2);
	95
	96	if (t2) {
	97	/* path present in resulting tree */
	98	tree_entry_extract(t2, &path, &mode);
	99	pathlen = tree_entry_len(&t2->entry);
	100	isdir = S_ISDIR(mode);
	101	} else {
	102	/*
	103	* a path was removed - take path from parent. Also take
	104	* mode from parent, to decide on recursion.
	105	*/
	106	tree_entry_extract(t1, &path, &mode);
	107	pathlen = tree_entry_len(&t1->entry);
	108
	109	isdir = S_ISDIR(mode);
	110	mode = 0;
	111	}
	112
	113	if (DIFF_OPT_TST(opt, RECURSIVE) && isdir) {
	114	recurse = 1;
	115	emitthis = DIFF_OPT_TST(opt, TREE_IN_RECURSIVE);
	116	}
ac1b3d12	117
48932677	118	strbuf_add(base, path, pathlen);
df533f34	119
d00e980c KS	120	if (emitthis)
	121	emit_diff(opt, base, t1, t2);
	122
	123	if (recurse) {
48932677	124	strbuf_addch(base, '/');
b9081a65 KS	125	ll_diff_tree_sha1(t1 ? t1->entry.sha1 : NULL,
b9081a65 KS	126	t2 ? t2->entry.sha1 : NULL, base->buf, opt);
d00e980c	127	}
48932677 NTND	128
48932677 NTND	129	strbuf_setlen(base, old_baselen);
ac1b3d12 LT	130	}
ac1b3d12 LT	131
48932677	132	static void skip_uninteresting(struct tree_desc t, struct strbuf base,
e9066121	133	struct diff_options *opt)
5d865017	134	{
e9066121 KS	135	enum interesting match;
e9066121 KS	136
5d865017	137	while (t->size) {
e9066121 KS	138	match = tree_entry_interesting(&t->entry, base, 0, &opt->pathspec);
	139	if (match) {
	140	if (match == all_entries_not_interesting)
97d0b74a NTND	141	t->size = 0;
97d0b74a NTND	142	break;
5d865017	143	}
97d0b74a	144	update_tree_entry(t);
5d865017 LT	145	}
	146	}
	147
52894e70 KS	148	static int ll_diff_tree_sha1(const unsigned char old, const unsigned char new,
52894e70 KS	149	const char base_str, struct diff_options opt)
ac1b3d12	150	{
52894e70 KS	151	struct tree_desc t1, t2;
52894e70 KS	152	void t1tree, t2tree;
48932677 NTND	153	struct strbuf base;
48932677 NTND	154	int baselen = strlen(base_str);
304de2d2	155
52894e70 KS	156	t1tree = fill_tree_descriptor(&t1, old);
	157	t2tree = fill_tree_descriptor(&t2, new);
	158
bc96cc87 NTND	159	/* Enable recursion indefinitely */
bc96cc87 NTND	160	opt->pathspec.recursive = DIFF_OPT_TST(opt, RECURSIVE);
bc96cc87	161
48932677 NTND	162	strbuf_init(&base, PATH_MAX);
	163	strbuf_add(&base, base_str, baselen);
	164
5d865017	165	for (;;) {
903bba68 KS	166	int cmp;
903bba68 KS	167
28b9264d	168	if (diff_can_quit_early(opt))
822cac01	169	break;
66f13625	170	if (opt->pathspec.nr) {
52894e70 KS	171	skip_uninteresting(&t1, &base, opt);
52894e70 KS	172	skip_uninteresting(&t2, &base, opt);
ac1b3d12	173	}
52894e70	174	if (!t1.size && !t2.size)
6ca844e9	175	break;
5dfb2bbd	176
52894e70	177	cmp = tree_entry_pathcmp(&t1, &t2);
5dfb2bbd KS	178
	179	/* t1 = t2 */
	180	if (cmp == 0) {
903bba68	181	if (DIFF_OPT_TST(opt, FIND_COPIES_HARDER) \|\|
52894e70 KS	182	hashcmp(t1.entry.sha1, t2.entry.sha1) \|\|
	183	(t1.entry.mode != t2.entry.mode))
	184	show_path(&base, opt, &t1, &t2);
903bba68	185
52894e70 KS	186	update_tree_entry(&t1);
52894e70 KS	187	update_tree_entry(&t2);
5dfb2bbd KS	188	}
	189
	190	/* t1 < t2 */
	191	else if (cmp < 0) {
52894e70 KS	192	show_path(&base, opt, &t1, /t2=/NULL);
52894e70 KS	193	update_tree_entry(&t1);
5dfb2bbd KS	194	}
	195
	196	/* t1 > t2 */
	197	else {
52894e70 KS	198	show_path(&base, opt, /t1=/NULL, &t2);
52894e70 KS	199	update_tree_entry(&t2);
ac1b3d12	200	}
ac1b3d12	201	}
48932677 NTND	202
48932677 NTND	203	strbuf_release(&base);
52894e70 KS	204	free(t2tree);
52894e70 KS	205	free(t1tree);
ac1b3d12 LT	206	return 0;
	207	}
	208
750f7b66 LT	209	/*
	210	* Does it look like the resulting diff might be due to a rename?
	211	* - single entry
	212	* - not a valid previous file
	213	*/
	214	static inline int diff_might_be_rename(void)
	215	{
	216	return diff_queued_diff.nr == 1 &&
	217	!DIFF_FILE_VALID(diff_queued_diff.queue[0]->one);
	218	}
	219
52894e70	220	static void try_to_follow_renames(const unsigned char old, const unsigned char new, const char base, struct diff_options opt)
750f7b66 LT	221	{
750f7b66 LT	222	struct diff_options diff_opts;
9f38e1ef LT	223	struct diff_queue_struct *q = &diff_queued_diff;
9f38e1ef LT	224	struct diff_filepair *choice;
750f7b66 LT	225	int i;
750f7b66 LT	226
8f4f8f45 NTND	227	/*
	228	* follow-rename code is very specific, we need exactly one
	229	* path. Magic that matches more than one path is not
	230	* supported.
	231	*/
5c6933d2	232	GUARD_PATHSPEC(&opt->pathspec, PATHSPEC_FROMTOP \| PATHSPEC_LITERAL);
8f4f8f45 NTND	233	#if 0
	234	/*
	235	* We should reject wildcards as well. Unfortunately we
	236	* haven't got a reliable way to detect that 'foo\*bar' in
	237	* fact has no wildcards. nowildcard_len is merely a hint for
	238	* optimization. Let it slip for now until wildmatch is taught
	239	* about dry-run mode and returns wildcard info.
	240	*/
	241	if (opt->pathspec.has_wildcard)
	242	die("BUG:%s:%d: wildcards are not supported",
	243	__FILE__, __LINE__);
	244	#endif
	245
9f38e1ef LT	246	/* Remove the file creation entry from the diff queue, and remember it */
	247	choice = q->queue[0];
	248	q->nr = 0;
	249
750f7b66	250	diff_setup(&diff_opts);
8f67f8ae	251	DIFF_OPT_SET(&diff_opts, RECURSIVE);
0cdca133	252	DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER);
750f7b66	253	diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
61588ccf	254	diff_opts.single_follow = opt->pathspec.items[0].match;
6dd4b66f	255	diff_opts.break_opt = opt->break_opt;
dd98d88b	256	diff_opts.rename_score = opt->rename_score;
28452655	257	diff_setup_done(&diff_opts);
52894e70	258	ll_diff_tree_sha1(old, new, base, &diff_opts);
750f7b66	259	diffcore_std(&diff_opts);
bd1928df	260	free_pathspec(&diff_opts.pathspec);
750f7b66	261
9f38e1ef	262	/* Go through the new set of filepairing, and see if we find a more interesting one */
44c48a90	263	opt->found_follow = 0;
9f38e1ef LT	264	for (i = 0; i < q->nr; i++) {
9f38e1ef LT	265	struct diff_filepair *p = q->queue[i];
750f7b66 LT	266
	267	/*
	268	* Found a source? Not only do we use that for the new
9f38e1ef	269	* diff_queued_diff, we will also use that as the path in
750f7b66 LT	270	* the future!
750f7b66 LT	271	*/
66f13625	272	if ((p->status == 'R' \|\| p->status == 'C') &&
61588ccf	273	!strcmp(p->two->path, opt->pathspec.items[0].match)) {
9a087274 NTND	274	const char *path[2];
9a087274 NTND	275
9f38e1ef LT	276	/* Switch the file-pairs around */
	277	q->queue[i] = choice;
	278	choice = p;
	279
	280	/* Update the path we use from now on.. */
9a087274 NTND	281	path[0] = p->one->path;
9a087274 NTND	282	path[1] = NULL;
bd1928df	283	free_pathspec(&opt->pathspec);
4a2d5ae2 NTND	284	parse_pathspec(&opt->pathspec,
	285	PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
	286	PATHSPEC_LITERAL_PATH, "", path);
44c48a90 JH	287
	288	/*
	289	* The caller expects us to return a set of vanilla
	290	* filepairs to let a later call to diffcore_std()
	291	* it makes to sort the renames out (among other
	292	* things), but we already have found renames
	293	* ourselves; signal diffcore_std() not to muck with
	294	* rename information.
	295	*/
	296	opt->found_follow = 1;
750f7b66 LT	297	break;
	298	}
	299	}
	300
	301	/*
3ea3c215	302	* Then, discard all the non-relevant file pairs...
9f38e1ef LT	303	*/
	304	for (i = 0; i < q->nr; i++) {
	305	struct diff_filepair *p = q->queue[i];
	306	diff_free_filepair(p);
	307	}
	308
	309	/*
	310	* .. and re-instate the one we want (which might be either the
	311	* original one, or the rename/copy we found)
750f7b66	312	*/
9f38e1ef LT	313	q->queue[0] = choice;
9f38e1ef LT	314	q->nr = 1;
750f7b66 LT	315	}
750f7b66 LT	316
ac1b3d12 LT	317	int diff_tree_sha1(const unsigned char old, const unsigned char new, const char base, struct diff_options opt)
ac1b3d12 LT	318	{
ac1b3d12 LT	319	int retval;
ac1b3d12 LT	320
52894e70 KS	321	retval = ll_diff_tree_sha1(old, new, base, opt);
	322	if (!*base && DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename())
	323	try_to_follow_renames(old, new, base, opt);
	324
ac1b3d12 LT	325	return retval;
	326	}
	327
2b60356d RS	328	int diff_root_tree_sha1(const unsigned char new, const char base, struct diff_options *opt)
2b60356d RS	329	{
0b707c33	330	return diff_tree_sha1(NULL, new, base, opt);
2b60356d	331	}