summaryrefslogtreecommitdiff
path: root/diff-tree.c
blob: 2f04d1eb9d9569b18b77220398f3a340d3352bf9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
#include "cache.h"
 
struct tree_entry;
 
static struct tree_entry *update_tree_entry(void **bufp, unsigned long *sizep)
{
	void *buf = *bufp;
	unsigned long size = *sizep;
	int len = strlen(buf) + 1 + 20;
 
	if (size < len)
		usage("corrupt tree file");
	*bufp = buf + len;
	*sizep = size - len;
	return buf;
}
 
static const unsigned char *extract(void *tree, unsigned long size, const char **pathp, unsigned int *modep)
{
	int len = strlen(tree)+1;
	const unsigned char *sha1 = tree + len;
	const char *path = strchr(tree, ' ');
 
	if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1)
		usage("corrupt tree file");
	*pathp = path+1;
	return sha1;
}
 
static void show_file(const char *prefix, void *tree, unsigned long size)
{
	unsigned mode;
	const char *path;
	const unsigned char *sha1 = extract(tree, size, &path, &mode);
	printf("%s%o %s %s%c", prefix, mode, sha1_to_hex(sha1), path, 0);
}
 
static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2)
{
	unsigned mode1, mode2;
	const char *path1, *path2;
	const unsigned char *sha1, *sha2;
	int cmp;
 
	sha1 = extract(tree1, size1, &path1, &mode1);
	sha2 = extract(tree2, size2, &path2, &mode2);
 
	cmp = cache_name_compare(path1, strlen(path1), path2, strlen(path2));
	if (cmp < 0) {
		show_file("-", tree1, size1);
		return -1;
	}
	if (cmp > 0) {
		show_file("+", tree2, size2);
		return 1;
	}
	if (!memcmp(sha1, sha2, 20) && mode1 == mode2)
		return 0;
	show_file("<", tree1, size1);
	show_file(">", tree2, size2);
	return 0;
}
 
static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2)
{
	while (size1 | size2) {
		if (!size1) {
			show_file("+", tree2, size2);
			update_tree_entry(&tree2, &size2);
			continue;
		}
		if (!size2) {
			show_file("-", tree1, size1);
			update_tree_entry(&tree1, &size1);
			continue;
		}
		switch (compare_tree_entry(tree1, size1, tree2, size2)) {
		case -1:
			update_tree_entry(&tree1, &size1);
			continue;
		case 0:
			update_tree_entry(&tree1, &size1);
			/* Fallthrough */
		case 1:
			update_tree_entry(&tree2, &size2);
			continue;
		}
		usage("diff-tree: internal error");
	}
	return 0;
}
 
int main(int argc, char **argv)
{
	unsigned char old[20], new[20];
	void *tree1, *tree2;
	unsigned long size1, size2;
	char type[20];
 
	if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
		usage("diff-tree <tree sha1> <tree sha1>");
	tree1 = read_sha1_file(old, type, &size1);
	if (!tree1 || strcmp(type, "tree"))
		usage("unable to read source tree");
	tree2 = read_sha1_file(new, type, &size2);
	if (!tree2 || strcmp(type, "tree"))
		usage("unable to read destination tree");
	return diff_tree(tree1, size1, tree2, size2);
}