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 die("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 die("corrupt tree file");
31 static char *malloc_base(const char *base, const char *path, int pathlen)
33 int baselen = strlen(base);
34 char *newbase = malloc(baselen + pathlen + 2);
35 memcpy(newbase, base, baselen);
36 memcpy(newbase + baselen, path, pathlen);
37 memcpy(newbase + baselen + pathlen, "/", 2);
41 static void show_file(const char *prefix, void *tree, unsigned long size, const char *base);
43 /* A whole sub-tree went away or appeared */
44 static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base)
47 show_file(prefix, tree, size, base);
48 update_tree_entry(&tree, &size);
52 /* A file entry went away or appeared */
53 static void show_file(const char *prefix, void *tree, unsigned long size, const char *base)
57 const unsigned char *sha1 = extract(tree, size, &path, &mode);
59 if (recursive && S_ISDIR(mode)) {
62 char *newbase = malloc_base(base, path, strlen(path));
65 tree = read_sha1_file(sha1, type, &size);
66 if (!tree || strcmp(type, "tree"))
67 die("corrupt tree sha %s", sha1_to_hex(sha1));
69 show_tree(prefix, tree, size, newbase);
76 printf("%s%o %s %s%s%c", prefix, mode, sha1_to_hex(sha1), base, path, 0);
79 static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
81 unsigned mode1, mode2;
82 const char *path1, *path2;
83 const unsigned char *sha1, *sha2;
84 int cmp, pathlen1, pathlen2;
85 char old_sha1_hex[50];
87 sha1 = extract(tree1, size1, &path1, &mode1);
88 sha2 = extract(tree2, size2, &path2, &mode2);
90 pathlen1 = strlen(path1);
91 pathlen2 = strlen(path2);
92 cmp = cache_name_compare(path1, pathlen1, path2, pathlen2);
94 show_file("-", tree1, size1, base);
98 show_file("+", tree2, size2, base);
101 if (!memcmp(sha1, sha2, 20) && mode1 == mode2)
105 * If the filemode has changed to/from a directory from/to a regular
106 * file, we need to consider it a remove and an add.
108 if (S_ISDIR(mode1) != S_ISDIR(mode2)) {
109 show_file("-", tree1, size1, base);
110 show_file("+", tree2, size2, base);
114 if (recursive && S_ISDIR(mode1)) {
116 char *newbase = malloc_base(base, path1, pathlen1);
117 retval = diff_tree_sha1(sha1, sha2, newbase);
122 strcpy(old_sha1_hex, sha1_to_hex(sha1));
123 printf("*%o->%o %s->%s %s%s%c", mode1, mode2, old_sha1_hex, sha1_to_hex(sha2), base, path1, 0);
127 static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
129 while (size1 | size2) {
131 show_file("+", tree2, size2, base);
132 update_tree_entry(&tree2, &size2);
136 show_file("-", tree1, size1, base);
137 update_tree_entry(&tree1, &size1);
140 switch (compare_tree_entry(tree1, size1, tree2, size2, base)) {
142 update_tree_entry(&tree1, &size1);
145 update_tree_entry(&tree1, &size1);
148 update_tree_entry(&tree2, &size2);
151 die("diff-tree: internal error");
156 static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base)
159 unsigned long size1, size2;
163 tree1 = read_sha1_file(old, type, &size1);
164 if (!tree1 || strcmp(type, "tree"))
165 die("unable to read source tree (%s)", sha1_to_hex(old));
166 tree2 = read_sha1_file(new, type, &size2);
167 if (!tree2 || strcmp(type, "tree"))
168 die("unable to read destination tree (%s)", sha1_to_hex(new));
169 retval = diff_tree(tree1, size1, tree2, size2, base);
175 int main(int argc, char **argv)
177 unsigned char old[20], new[20];
183 if (!strcmp(arg, "-r")) {
187 usage("diff-tree [-R] <tree sha1> <tree sha1>");
190 if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
191 usage("diff-tree <tree sha1> <tree sha1>");
192 return diff_tree_sha1(old, new, "");