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
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
|
#include "cache.h"
static int recursive = 0;
static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *src, const char *dst);
static void 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;
}
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, const char *base)
{
unsigned mode;
const char *path;
const unsigned char *sha1 = extract(tree, size, &path, &mode);
printf("%s%o %s %s%s%c", prefix, mode, sha1_to_hex(sha1), base, path, 0);
}
static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *src, const char *dst)
{
unsigned mode1, mode2;
const char *path1, *path2;
const unsigned char *sha1, *sha2;
int cmp, pathlen1, pathlen2;
sha1 = extract(tree1, size1, &path1, &mode1);
sha2 = extract(tree2, size2, &path2, &mode2);
pathlen1 = strlen(path1);
pathlen2 = strlen(path2);
cmp = cache_name_compare(path1, pathlen1, path2, pathlen2);
if (cmp < 0) {
show_file("-", tree1, size1, src);
return -1;
}
if (cmp > 0) {
show_file("+", tree2, size2, dst);
return 1;
}
if (!memcmp(sha1, sha2, 20) && mode1 == mode2)
return 0;
if (recursive && S_ISDIR(mode1) && S_ISDIR(mode2)) {
int srclen = strlen(src);
int dstlen = strlen(dst);
char *srcbase = malloc(srclen + pathlen1 + 2);
char *dstbase = malloc(srclen + pathlen1 + 2);
memcpy(srcbase, src, srclen);
memcpy(srcbase + srclen, path1, pathlen1);
memcpy(srcbase + srclen + pathlen1, "/", 2);
memcpy(dstbase, dst, dstlen);
memcpy(dstbase + dstlen, path2, pathlen2);
memcpy(dstbase + dstlen + pathlen2, "/", 2);
return diff_tree_sha1(sha1, sha2, srcbase, dstbase);
}
show_file("<", tree1, size1, src);
show_file(">", tree2, size2, dst);
return 0;
}
static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *src, const char *dst)
{
while (size1 | size2) {
if (!size1) {
show_file("+", tree2, size2, dst);
update_tree_entry(&tree2, &size2);
continue;
}
if (!size2) {
show_file("-", tree1, size1, src);
update_tree_entry(&tree1, &size1);
continue;
}
switch (compare_tree_entry(tree1, size1, tree2, size2, src, dst)) {
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;
}
static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *src, const char *dst)
{
void *tree1, *tree2;
unsigned long size1, size2;
char type[20];
int retval;
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");
retval = diff_tree(tree1, size1, tree2, size2, src, dst);
free(tree1);
free(tree2);
return retval;
}
int main(int argc, char **argv)
{
unsigned char old[20], new[20];
while (argc > 3) {
char *arg = argv[1];
argv++;
argc--;
if (!strcmp(arg, "-R")) {
recursive = 1;
continue;
}
usage("diff-tree [-R] <tree sha1> <tree sha1>");
}
if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
usage("diff-tree <tree sha1> <tree sha1>");
return diff_tree_sha1(old, new, "", "");
}
|
