[thirdparty/git.git] / match-trees.c

#include "cache.h"
#include "tree.h"
#include "tree-walk.h"
#include "object-store.h"

static int score_missing(unsigned mode, const char *path)
{
	int score;

	if (S_ISDIR(mode))
		score = -1000;
	else if (S_ISLNK(mode))
		score = -500;
	else
		score = -50;
	return score;
}

static int score_differs(unsigned mode1, unsigned mode2, const char *path)
{
	int score;

	if (S_ISDIR(mode1) != S_ISDIR(mode2))
		score = -100;
	else if (S_ISLNK(mode1) != S_ISLNK(mode2))
		score = -50;
	else
		score = -5;
	return score;
}

static int score_matches(unsigned mode1, unsigned mode2, const char *path)
{
	int score;

	/* Heh, we found SHA-1 collisions between different kind of objects */
	if (S_ISDIR(mode1) != S_ISDIR(mode2))
		score = -100;
	else if (S_ISLNK(mode1) != S_ISLNK(mode2))
		score = -50;

	else if (S_ISDIR(mode1))
		score = 1000;
	else if (S_ISLNK(mode1))
		score = 500;
	else
		score = 250;
	return score;
}

static void *fill_tree_desc_strict(struct tree_desc *desc,
				   const struct object_id *hash)
{
	void *buffer;
	enum object_type type;
	unsigned long size;

	buffer = read_object_file(hash, &type, &size);
	if (!buffer)
		die("unable to read tree (%s)", oid_to_hex(hash));
	if (type != OBJ_TREE)
		die("%s is not a tree", oid_to_hex(hash));
	init_tree_desc(desc, buffer, size);
	return buffer;
}

static int base_name_entries_compare(const struct name_entry *a,
				     const struct name_entry *b)
{
	return base_name_compare(a->path, tree_entry_len(a), a->mode,
				 b->path, tree_entry_len(b), b->mode);
}

/*
 * Inspect two trees, and give a score that tells how similar they are.
 */
static int score_trees(const struct object_id *hash1, const struct object_id *hash2)
{
	struct tree_desc one;
	struct tree_desc two;
	void *one_buf = fill_tree_desc_strict(&one, hash1);
	void *two_buf = fill_tree_desc_strict(&two, hash2);
	int score = 0;

	for (;;) {
		int cmp;

		if (one.size && two.size)
			cmp = base_name_entries_compare(&one.entry, &two.entry);
		else if (one.size)
			/* two lacks this entry */
			cmp = -1;
		else if (two.size)
			/* two has more entries */
			cmp = 1;
		else
			break;

		if (cmp < 0) {
			/* path1 does not appear in two */
			score += score_missing(one.entry.mode, one.entry.path);
			update_tree_entry(&one);
		} else if (cmp > 0) {
			/* path2 does not appear in one */
			score += score_missing(two.entry.mode, two.entry.path);
			update_tree_entry(&two);
		} else {
			/* path appears in both */
			if (!oideq(one.entry.oid, two.entry.oid)) {
				/* they are different */
				score += score_differs(one.entry.mode,
						       two.entry.mode,
						       one.entry.path);
			} else {
				/* same subtree or blob */
				score += score_matches(one.entry.mode,
						       two.entry.mode,
						       one.entry.path);
			}
			update_tree_entry(&one);
			update_tree_entry(&two);
		}
	}
	free(one_buf);
	free(two_buf);
	return score;
}

/*
 * Match one itself and its subtrees with two and pick the best match.
 */
static void match_trees(const struct object_id *hash1,
			const struct object_id *hash2,
			int *best_score,
			char **best_match,
			const char *base,
			int recurse_limit)
{
	struct tree_desc one;
	void *one_buf = fill_tree_desc_strict(&one, hash1);

	while (one.size) {
		const char *path;
		const struct object_id *elem;
		unsigned mode;
		int score;

		elem = tree_entry_extract(&one, &path, &mode);
		if (!S_ISDIR(mode))
			goto next;
		score = score_trees(elem, hash2);
		if (*best_score < score) {
			free(*best_match);
			*best_match = xstrfmt("%s%s", base, path);
			*best_score = score;
		}
		if (recurse_limit) {
			char *newbase = xstrfmt("%s%s/", base, path);
			match_trees(elem, hash2, best_score, best_match,
				    newbase, recurse_limit - 1);
			free(newbase);
		}

	next:
		update_tree_entry(&one);
	}
	free(one_buf);
}

/*
 * A tree "oid1" has a subdirectory at "prefix".  Come up with a tree object by
 * replacing it with another tree "oid2".
 */
static int splice_tree(const struct object_id *oid1, const char *prefix,
		       const struct object_id *oid2, struct object_id *result)
{
	char *subpath;
	int toplen;
	char *buf;
	unsigned long sz;
	struct tree_desc desc;
	unsigned char *rewrite_here;
	const struct object_id *rewrite_with;
	struct object_id subtree;
	enum object_type type;
	int status;

	subpath = strchrnul(prefix, '/');
	toplen = subpath - prefix;
	if (*subpath)
		subpath++;

	buf = read_object_file(oid1, &type, &sz);
	if (!buf)
		die("cannot read tree %s", oid_to_hex(oid1));
	init_tree_desc(&desc, buf, sz);

	rewrite_here = NULL;
	while (desc.size) {
		const char *name;
		unsigned mode;

		tree_entry_extract(&desc, &name, &mode);
		if (strlen(name) == toplen &&
		    !memcmp(name, prefix, toplen)) {
			if (!S_ISDIR(mode))
				die("entry %s in tree %s is not a tree", name,
				    oid_to_hex(oid1));

			/*
			 * We cast here for two reasons:
			 *
			 *   - to flip the "char *" (for the path) to "unsigned
			 *     char *" (for the hash stored after it)
			 *
			 *   - to discard the "const"; this is OK because we
			 *     know it points into our non-const "buf"
			 */
			rewrite_here = (unsigned char *)(desc.entry.path +
							 strlen(desc.entry.path) +
							 1);
			break;
		}
		update_tree_entry(&desc);
	}
	if (!rewrite_here)
		die("entry %.*s not found in tree %s", toplen, prefix,
		    oid_to_hex(oid1));
	if (*subpath) {
		struct object_id tree_oid;
		hashcpy(tree_oid.hash, rewrite_here);
		status = splice_tree(&tree_oid, subpath, oid2, &subtree);
		if (status)
			return status;
		rewrite_with = &subtree;
	} else {
		rewrite_with = oid2;
	}
	hashcpy(rewrite_here, rewrite_with->hash);
	status = write_object_file(buf, sz, tree_type, result);
	free(buf);
	return status;
}

/*
 * We are trying to come up with a merge between one and two that
 * results in a tree shape similar to one.  The tree two might
 * correspond to a subtree of one, in which case it needs to be
 * shifted down by prefixing otherwise empty directories.  On the
 * other hand, it could cover tree one and we might need to pick a
 * subtree of it.
 */
void shift_tree(const struct object_id *hash1,
		const struct object_id *hash2,
		struct object_id *shifted,
		int depth_limit)
{
	char *add_prefix;
	char *del_prefix;
	int add_score, del_score;

	/*
	 * NEEDSWORK: this limits the recursion depth to hardcoded
	 * value '2' to avoid excessive overhead.
	 */
	if (!depth_limit)
		depth_limit = 2;

	add_score = del_score = score_trees(hash1, hash2);
	add_prefix = xcalloc(1, 1);
	del_prefix = xcalloc(1, 1);

	/*
	 * See if one's subtree resembles two; if so we need to prefix
	 * two with a few fake trees to match the prefix.
	 */
	match_trees(hash1, hash2, &add_score, &add_prefix, "", depth_limit);

	/*
	 * See if two's subtree resembles one; if so we need to
	 * pick only subtree of two.
	 */
	match_trees(hash2, hash1, &del_score, &del_prefix, "", depth_limit);

	/* Assume we do not have to do any shifting */
	oidcpy(shifted, hash2);

	if (add_score < del_score) {
		/* We need to pick a subtree of two */
		unsigned mode;

		if (!*del_prefix)
			return;

		if (get_tree_entry(hash2, del_prefix, shifted, &mode))
			die("cannot find path %s in tree %s",
			    del_prefix, oid_to_hex(hash2));
		return;
	}

	if (!*add_prefix)
		return;

	splice_tree(hash1, add_prefix, hash2, shifted);
}

/*
 * The user says the trees will be shifted by this much.
 * Unfortunately we cannot fundamentally tell which one to
 * be prefixed, as recursive merge can work in either direction.
 */
void shift_tree_by(const struct object_id *hash1,
		   const struct object_id *hash2,
		   struct object_id *shifted,
		   const char *shift_prefix)
{
	struct object_id sub1, sub2;
	unsigned mode1, mode2;
	unsigned candidate = 0;

	/* Can hash2 be a tree at shift_prefix in tree hash1? */
	if (!get_tree_entry(hash1, shift_prefix, &sub1, &mode1) &&
	    S_ISDIR(mode1))
		candidate |= 1;

	/* Can hash1 be a tree at shift_prefix in tree hash2? */
	if (!get_tree_entry(hash2, shift_prefix, &sub2, &mode2) &&
	    S_ISDIR(mode2))
		candidate |= 2;

	if (candidate == 3) {
		/* Both are plausible -- we need to evaluate the score */
		int best_score = score_trees(hash1, hash2);
		int score;

		candidate = 0;
		score = score_trees(&sub1, hash2);
		if (score > best_score) {
			candidate = 1;
			best_score = score;
		}
		score = score_trees(&sub2, hash1);
		if (score > best_score)
			candidate = 2;
	}

	if (!candidate) {
		/* Neither is plausible -- do not shift */
		oidcpy(shifted, hash2);
		return;
	}

	if (candidate == 1)
		/*
		 * shift tree2 down by adding shift_prefix above it
		 * to match tree1.
		 */
		splice_tree(hash1, shift_prefix, hash2, shifted);
	else
		/*
		 * shift tree2 up by removing shift_prefix from it
		 * to match tree1.
		 */
		oidcpy(shifted, &sub2);
}
Commit	Line	Data
68faf689 JH	1	#include "cache.h"
	2	#include "tree.h"
	3	#include "tree-walk.h"
cbd53a21	4	#include "object-store.h"
68faf689 JH	5
	6	static int score_missing(unsigned mode, const char *path)
	7	{
	8	int score;
	9
	10	if (S_ISDIR(mode))
	11	score = -1000;
	12	else if (S_ISLNK(mode))
	13	score = -500;
	14	else
	15	score = -50;
	16	return score;
	17	}
	18
	19	static int score_differs(unsigned mode1, unsigned mode2, const char *path)
	20	{
	21	int score;
	22
	23	if (S_ISDIR(mode1) != S_ISDIR(mode2))
	24	score = -100;
	25	else if (S_ISLNK(mode1) != S_ISLNK(mode2))
	26	score = -50;
	27	else
	28	score = -5;
	29	return score;
	30	}
	31
	32	static int score_matches(unsigned mode1, unsigned mode2, const char *path)
	33	{
	34	int score;
	35
	36	/* Heh, we found SHA-1 collisions between different kind of objects */
	37	if (S_ISDIR(mode1) != S_ISDIR(mode2))
	38	score = -100;
	39	else if (S_ISLNK(mode1) != S_ISLNK(mode2))
	40	score = -50;
	41
	42	else if (S_ISDIR(mode1))
	43	score = 1000;
	44	else if (S_ISLNK(mode1))
	45	score = 500;
	46	else
	47	score = 250;
	48	return score;
	49	}
	50
10a3fb00	51	static void fill_tree_desc_strict(struct tree_desc desc,
b6aec868	52	const struct object_id *hash)
10a3fb00 RS	53	{
	54	void *buffer;
	55	enum object_type type;
	56	unsigned long size;
	57
b4f5aca4	58	buffer = read_object_file(hash, &type, &size);
10a3fb00	59	if (!buffer)
b6aec868	60	die("unable to read tree (%s)", oid_to_hex(hash));
10a3fb00	61	if (type != OBJ_TREE)
b6aec868	62	die("%s is not a tree", oid_to_hex(hash));
10a3fb00 RS	63	init_tree_desc(desc, buffer, size);
	64	return buffer;
	65	}
	66
d8febde3 RS	67	static int base_name_entries_compare(const struct name_entry *a,
	68	const struct name_entry *b)
	69	{
	70	return base_name_compare(a->path, tree_entry_len(a), a->mode,
	71	b->path, tree_entry_len(b), b->mode);
	72	}
	73
68faf689 JH	74	/*
	75	* Inspect two trees, and give a score that tells how similar they are.
	76	*/
b6aec868	77	static int score_trees(const struct object_id hash1, const struct object_id hash2)
68faf689 JH	78	{
	79	struct tree_desc one;
	80	struct tree_desc two;
10a3fb00 RS	81	void *one_buf = fill_tree_desc_strict(&one, hash1);
10a3fb00 RS	82	void *two_buf = fill_tree_desc_strict(&two, hash2);
68faf689	83	int score = 0;
68faf689	84
d8febde3	85	for (;;) {
68faf689 JH	86	int cmp;
68faf689 JH	87
2ec41507 JK	88	if (one.size && two.size)
	89	cmp = base_name_entries_compare(&one.entry, &two.entry);
	90	else if (one.size)
68faf689	91	/* two lacks this entry */
d8febde3	92	cmp = -1;
2ec41507	93	else if (two.size)
d8febde3 RS	94	/* two has more entries */
	95	cmp = 1;
	96	else
	97	break;
	98
2ec41507	99	if (cmp < 0) {
68faf689	100	/* path1 does not appear in two */
2ec41507 JK	101	score += score_missing(one.entry.mode, one.entry.path);
	102	update_tree_entry(&one);
	103	} else if (cmp > 0) {
68faf689	104	/* path2 does not appear in one */
2ec41507 JK	105	score += score_missing(two.entry.mode, two.entry.path);
	106	update_tree_entry(&two);
	107	} else {
	108	/* path appears in both */
9001dc2a	109	if (!oideq(one.entry.oid, two.entry.oid)) {
2ec41507 JK	110	/* they are different */
	111	score += score_differs(one.entry.mode,
	112	two.entry.mode,
	113	one.entry.path);
	114	} else {
	115	/* same subtree or blob */
	116	score += score_matches(one.entry.mode,
	117	two.entry.mode,
	118	one.entry.path);
	119	}
	120	update_tree_entry(&one);
	121	update_tree_entry(&two);
	122	}
68faf689 JH	123	}
	124	free(one_buf);
	125	free(two_buf);
	126	return score;
	127	}
	128
	129	/*
	130	* Match one itself and its subtrees with two and pick the best match.
	131	*/
b6aec868	132	static void match_trees(const struct object_id *hash1,
b6aec868	133	const struct object_id *hash2,
68faf689 JH	134	int *best_score,
68faf689 JH	135	char **best_match,
538dfe73	136	const char *base,
68faf689 JH	137	int recurse_limit)
	138	{
	139	struct tree_desc one;
10a3fb00	140	void *one_buf = fill_tree_desc_strict(&one, hash1);
68faf689 JH	141
	142	while (one.size) {
	143	const char *path;
ce6663a9	144	const struct object_id *elem;
68faf689 JH	145	unsigned mode;
	146	int score;
	147
	148	elem = tree_entry_extract(&one, &path, &mode);
	149	if (!S_ISDIR(mode))
	150	goto next;
b6aec868	151	score = score_trees(elem, hash2);
68faf689	152	if (*best_score < score) {
68faf689	153	free(*best_match);
28310186	154	*best_match = xstrfmt("%s%s", base, path);
68faf689 JH	155	*best_score = score;
	156	}
	157	if (recurse_limit) {
28310186	158	char *newbase = xstrfmt("%s%s/", base, path);
b6aec868	159	match_trees(elem, hash2, best_score, best_match,
68faf689 JH	160	newbase, recurse_limit - 1);
	161	free(newbase);
	162	}
	163
	164	next:
	165	update_tree_entry(&one);
	166	}
	167	free(one_buf);
	168	}
	169
	170	/*
3b34934d PO	171	* A tree "oid1" has a subdirectory at "prefix". Come up with a tree object by
3b34934d PO	172	* replacing it with another tree "oid2".
68faf689	173	*/
3b34934d PO	174	static int splice_tree(const struct object_id oid1, const char prefix,
3b34934d PO	175	const struct object_id oid2, struct object_id result)
68faf689 JH	176	{
	177	char *subpath;
	178	int toplen;
	179	char *buf;
	180	unsigned long sz;
	181	struct tree_desc desc;
f55ac431	182	unsigned char *rewrite_here;
3b34934d PO	183	const struct object_id *rewrite_with;
3b34934d PO	184	struct object_id subtree;
68faf689 JH	185	enum object_type type;
	186	int status;
	187
2c5495f7 RM	188	subpath = strchrnul(prefix, '/');
	189	toplen = subpath - prefix;
	190	if (*subpath)
68faf689	191	subpath++;
68faf689	192
b4f5aca4	193	buf = read_object_file(oid1, &type, &sz);
68faf689	194	if (!buf)
3b34934d	195	die("cannot read tree %s", oid_to_hex(oid1));
68faf689 JH	196	init_tree_desc(&desc, buf, sz);
	197
	198	rewrite_here = NULL;
	199	while (desc.size) {
	200	const char *name;
	201	unsigned mode;
68faf689	202
36775ab5	203	tree_entry_extract(&desc, &name, &mode);
68faf689 JH	204	if (strlen(name) == toplen &&
	205	!memcmp(name, prefix, toplen)) {
	206	if (!S_ISDIR(mode))
3b34934d PO	207	die("entry %s in tree %s is not a tree", name,
3b34934d PO	208	oid_to_hex(oid1));
f55ac431	209
	210	/*
	211	* We cast here for two reasons:
	212	*
	213	* - to flip the "char *" (for the path) to "unsigned
	214	* char *" (for the hash stored after it)
	215	*
	216	* - to discard the "const"; this is OK because we
	217	* know it points into our non-const "buf"
	218	*/
	219	rewrite_here = (unsigned char *)(desc.entry.path +
	220	strlen(desc.entry.path) +
	221	1);
68faf689 JH	222	break;
	223	}
	224	update_tree_entry(&desc);
	225	}
	226	if (!rewrite_here)
3b34934d PO	227	die("entry %.*s not found in tree %s", toplen, prefix,
3b34934d PO	228	oid_to_hex(oid1));
2c5495f7	229	if (*subpath) {
f55ac431	230	struct object_id tree_oid;
	231	hashcpy(tree_oid.hash, rewrite_here);
	232	status = splice_tree(&tree_oid, subpath, oid2, &subtree);
68faf689 JH	233	if (status)
68faf689 JH	234	return status;
3b34934d PO	235	rewrite_with = &subtree;
	236	} else {
	237	rewrite_with = oid2;
68faf689	238	}
f55ac431	239	hashcpy(rewrite_here, rewrite_with->hash);
a09c985e	240	status = write_object_file(buf, sz, tree_type, result);
68faf689 JH	241	free(buf);
	242	return status;
	243	}
	244
	245	/*
	246	* We are trying to come up with a merge between one and two that
	247	* results in a tree shape similar to one. The tree two might
	248	* correspond to a subtree of one, in which case it needs to be
	249	* shifted down by prefixing otherwise empty directories. On the
	250	* other hand, it could cover tree one and we might need to pick a
	251	* subtree of it.
	252	*/
82db3d44	253	void shift_tree(const struct object_id *hash1,
	254	const struct object_id *hash2,
	255	struct object_id *shifted,
68faf689 JH	256	int depth_limit)
	257	{
	258	char *add_prefix;
	259	char *del_prefix;
	260	int add_score, del_score;
	261
85e51b78 JH	262	/*
	263	* NEEDSWORK: this limits the recursion depth to hardcoded
	264	* value '2' to avoid excessive overhead.
	265	*/
	266	if (!depth_limit)
	267	depth_limit = 2;
	268
b6aec868	269	add_score = del_score = score_trees(hash1, hash2);
68faf689 JH	270	add_prefix = xcalloc(1, 1);
	271	del_prefix = xcalloc(1, 1);
	272
	273	/*
	274	* See if one's subtree resembles two; if so we need to prefix
	275	* two with a few fake trees to match the prefix.
	276	*/
b6aec868	277	match_trees(hash1, hash2, &add_score, &add_prefix, "", depth_limit);
68faf689 JH	278
	279	/*
	280	* See if two's subtree resembles one; if so we need to
	281	* pick only subtree of two.
	282	*/
b6aec868	283	match_trees(hash2, hash1, &del_score, &del_prefix, "", depth_limit);
68faf689 JH	284
68faf689 JH	285	/* Assume we do not have to do any shifting */
82db3d44	286	oidcpy(shifted, hash2);
68faf689 JH	287
	288	if (add_score < del_score) {
	289	/* We need to pick a subtree of two */
	290	unsigned mode;
	291
	292	if (!*del_prefix)
	293	return;
	294
916bc35b	295	if (get_tree_entry(hash2, del_prefix, shifted, &mode))
68faf689	296	die("cannot find path %s in tree %s",
82db3d44	297	del_prefix, oid_to_hex(hash2));
68faf689 JH	298	return;
	299	}
	300
	301	if (!*add_prefix)
	302	return;
	303
3b34934d	304	splice_tree(hash1, add_prefix, hash2, shifted);
68faf689	305	}
85e51b78 JH	306
	307	/*
	308	* The user says the trees will be shifted by this much.
	309	* Unfortunately we cannot fundamentally tell which one to
	310	* be prefixed, as recursive merge can work in either direction.
	311	*/
82db3d44	312	void shift_tree_by(const struct object_id *hash1,
	313	const struct object_id *hash2,
	314	struct object_id *shifted,
85e51b78 JH	315	const char *shift_prefix)
85e51b78 JH	316	{
82db3d44	317	struct object_id sub1, sub2;
85e51b78 JH	318	unsigned mode1, mode2;
	319	unsigned candidate = 0;
	320
	321	/* Can hash2 be a tree at shift_prefix in tree hash1? */
916bc35b	322	if (!get_tree_entry(hash1, shift_prefix, &sub1, &mode1) &&
85e51b78 JH	323	S_ISDIR(mode1))
	324	candidate \|= 1;
	325
	326	/* Can hash1 be a tree at shift_prefix in tree hash2? */
916bc35b	327	if (!get_tree_entry(hash2, shift_prefix, &sub2, &mode2) &&
85e51b78 JH	328	S_ISDIR(mode2))
	329	candidate \|= 2;
	330
	331	if (candidate == 3) {
	332	/* Both are plausible -- we need to evaluate the score */
b6aec868	333	int best_score = score_trees(hash1, hash2);
85e51b78 JH	334	int score;
	335
	336	candidate = 0;
b6aec868	337	score = score_trees(&sub1, hash2);
85e51b78 JH	338	if (score > best_score) {
	339	candidate = 1;
	340	best_score = score;
	341	}
b6aec868	342	score = score_trees(&sub2, hash1);
85e51b78 JH	343	if (score > best_score)
	344	candidate = 2;
	345	}
	346
	347	if (!candidate) {
	348	/* Neither is plausible -- do not shift */
82db3d44	349	oidcpy(shifted, hash2);
85e51b78 JH	350	return;
	351	}
	352
	353	if (candidate == 1)
	354	/*
	355	* shift tree2 down by adding shift_prefix above it
	356	* to match tree1.
	357	*/
3b34934d	358	splice_tree(hash1, shift_prefix, hash2, shifted);
85e51b78 JH	359	else
	360	/*
	361	* shift tree2 up by removing shift_prefix from it
	362	* to match tree1.
	363	*/
82db3d44	364	oidcpy(shifted, &sub2);
85e51b78	365	}