3 static int recursive = 0;
5 static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base);
7 static void update_tree_entry(void **bufp, unsigned long *sizep)
10 unsigned long size = *sizep;
11 int len = strlen(buf) + 1 + 20;
14 usage("corrupt tree file");
19 static const unsigned char *extract(void *tree, unsigned long size, const char **pathp, unsigned int *modep)
21 int len = strlen(tree)+1;
22 const unsigned char *sha1 = tree + len;
23 const char *path = strchr(tree, ' ');
25 if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1)
26 usage("corrupt tree file");
31 static void show_file(const char *prefix, void *tree, unsigned long size, const char *base)
35 const unsigned char *sha1 = extract(tree, size, &path, &mode);
36 printf("%s%o %s %s%s%c", prefix, mode, sha1_to_hex(sha1), base, path, 0);
39 static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
41 unsigned mode1, mode2;
42 const char *path1, *path2;
43 const unsigned char *sha1, *sha2;
44 int cmp, pathlen1, pathlen2;
45 char old_sha1_hex[50];
47 sha1 = extract(tree1, size1, &path1, &mode1);
48 sha2 = extract(tree2, size2, &path2, &mode2);
50 pathlen1 = strlen(path1);
51 pathlen2 = strlen(path2);
52 cmp = cache_name_compare(path1, pathlen1, path2, pathlen2);
54 show_file("-", tree1, size1, base);
58 show_file("+", tree2, size2, base);
61 if (!memcmp(sha1, sha2, 20) && mode1 == mode2)
63 if (recursive && S_ISDIR(mode1) && S_ISDIR(mode2)) {
65 int baselen = strlen(base);
66 char *newbase = malloc(baselen + pathlen1 + 2);
67 memcpy(newbase, base, baselen);
68 memcpy(newbase + baselen, path1, pathlen1);
69 memcpy(newbase + baselen + pathlen1, "/", 2);
70 retval = diff_tree_sha1(sha1, sha2, newbase);
75 strcpy(old_sha1_hex, sha1_to_hex(sha1));
76 printf("*%o->%o %s->%s %s%s%c", mode1, mode2, old_sha1_hex, sha1_to_hex(sha2), base, path1, 0);
80 static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
82 while (size1 | size2) {
84 show_file("+", tree2, size2, base);
85 update_tree_entry(&tree2, &size2);
89 show_file("-", tree1, size1, base);
90 update_tree_entry(&tree1, &size1);
93 switch (compare_tree_entry(tree1, size1, tree2, size2, base)) {
95 update_tree_entry(&tree1, &size1);
98 update_tree_entry(&tree1, &size1);
101 update_tree_entry(&tree2, &size2);
104 usage("diff-tree: internal error");
109 static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base)
112 unsigned long size1, size2;
116 tree1 = read_sha1_file(old, type, &size1);
117 if (!tree1 || strcmp(type, "tree"))
118 usage("unable to read source tree");
119 tree2 = read_sha1_file(new, type, &size2);
120 if (!tree2 || strcmp(type, "tree"))
121 usage("unable to read destination tree");
122 retval = diff_tree(tree1, size1, tree2, size2, base);
128 int main(int argc, char **argv)
130 unsigned char old[20], new[20];
136 if (!strcmp(arg, "-R")) {
140 usage("diff-tree [-R] <tree sha1> <tree sha1>");
143 if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
144 usage("diff-tree <tree sha1> <tree sha1>");
145 return diff_tree_sha1(old, new, "");