]>
git.ipfire.org Git - thirdparty/git.git/blob - diff-tree.c
6 static int verbose_header
= 0;
7 static int ignore_merges
= 1;
8 static int recursive
= 0;
9 static int read_stdin
= 0;
10 static int line_termination
= '\n';
11 static int generate_patch
= 0;
12 static const char *header
= NULL
;
13 static const char *header_prefix
= "";
15 // What paths are we interested in?
16 static int nr_paths
= 0;
17 static char **paths
= NULL
;
18 static int *pathlens
= NULL
;
20 static int diff_tree_sha1(const unsigned char *old
, const unsigned char *new, const char *base
);
22 static void update_tree_entry(void **bufp
, unsigned long *sizep
)
25 unsigned long size
= *sizep
;
26 int len
= strlen(buf
) + 1 + 20;
29 die("corrupt tree file");
34 static const unsigned char *extract(void *tree
, unsigned long size
, const char **pathp
, unsigned int *modep
)
36 int len
= strlen(tree
)+1;
37 const unsigned char *sha1
= tree
+ len
;
38 const char *path
= strchr(tree
, ' ');
40 if (!path
|| size
< len
+ 20 || sscanf(tree
, "%o", modep
) != 1)
41 die("corrupt tree file");
46 static char *malloc_base(const char *base
, const char *path
, int pathlen
)
48 int baselen
= strlen(base
);
49 char *newbase
= xmalloc(baselen
+ pathlen
+ 2);
50 memcpy(newbase
, base
, baselen
);
51 memcpy(newbase
+ baselen
, path
, pathlen
);
52 memcpy(newbase
+ baselen
+ pathlen
, "/", 2);
56 static void show_file(const char *prefix
, void *tree
, unsigned long size
, const char *base
);
58 /* A whole sub-tree went away or appeared */
59 static void show_tree(const char *prefix
, void *tree
, unsigned long size
, const char *base
)
62 show_file(prefix
, tree
, size
, base
);
63 update_tree_entry(&tree
, &size
);
67 /* A file entry went away or appeared */
68 static void show_file(const char *prefix
, void *tree
, unsigned long size
, const char *base
)
72 const unsigned char *sha1
= extract(tree
, size
, &path
, &mode
);
82 if (recursive
&& S_ISDIR(mode
)) {
85 char *newbase
= malloc_base(base
, path
, strlen(path
));
88 tree
= read_sha1_file(sha1
, type
, &size
);
89 if (!tree
|| strcmp(type
, "tree"))
90 die("corrupt tree sha %s", sha1_to_hex(sha1
));
92 show_tree(prefix
, tree
, size
, newbase
);
101 diff_addremove(prefix
[0], mode
, sha1
, base
, path
);
104 printf("%s%06o\t%s\t%s\t%s%s%c", prefix
, mode
,
105 S_ISDIR(mode
) ? "tree" : "blob",
106 sha1_to_hex(sha1
), base
, path
,
110 static int compare_tree_entry(void *tree1
, unsigned long size1
, void *tree2
, unsigned long size2
, const char *base
)
112 unsigned mode1
, mode2
;
113 const char *path1
, *path2
;
114 const unsigned char *sha1
, *sha2
;
115 int cmp
, pathlen1
, pathlen2
;
116 char old_sha1_hex
[50];
118 sha1
= extract(tree1
, size1
, &path1
, &mode1
);
119 sha2
= extract(tree2
, size2
, &path2
, &mode2
);
121 pathlen1
= strlen(path1
);
122 pathlen2
= strlen(path2
);
123 cmp
= cache_name_compare(path1
, pathlen1
, path2
, pathlen2
);
125 show_file("-", tree1
, size1
, base
);
129 show_file("+", tree2
, size2
, base
);
132 if (!memcmp(sha1
, sha2
, 20) && mode1
== mode2
)
136 * If the filemode has changed to/from a directory from/to a regular
137 * file, we need to consider it a remove and an add.
139 if (S_ISDIR(mode1
) != S_ISDIR(mode2
)) {
140 show_file("-", tree1
, size1
, base
);
141 show_file("+", tree2
, size2
, base
);
145 if (recursive
&& S_ISDIR(mode1
)) {
147 char *newbase
= malloc_base(base
, path1
, pathlen1
);
148 retval
= diff_tree_sha1(sha1
, sha2
, newbase
);
154 printf("%s", header
);
160 if (generate_patch
) {
162 diff_change(mode1
, mode2
, sha1
, sha2
, base
, path1
);
165 strcpy(old_sha1_hex
, sha1_to_hex(sha1
));
166 printf("*%06o->%06o\t%s\t%s->%s\t%s%s%c", mode1
, mode2
,
167 S_ISDIR(mode1
) ? "tree" : "blob",
168 old_sha1_hex
, sha1_to_hex(sha2
), base
, path1
,
174 static int interesting(void *tree
, unsigned long size
, const char *base
)
179 int baselen
, pathlen
;
184 (void)extract(tree
, size
, &path
, &mode
);
186 pathlen
= strlen(path
);
187 baselen
= strlen(base
);
189 for (i
=0; i
< nr_paths
; i
++) {
190 const char *match
= paths
[i
];
191 int matchlen
= pathlens
[i
];
193 if (baselen
>= matchlen
) {
194 /* If it doesn't match, move along... */
195 if (strncmp(base
, match
, matchlen
))
198 /* The base is a subdirectory of a path which was specified. */
202 /* Does the base match? */
203 if (strncmp(base
, match
, baselen
))
209 if (pathlen
> matchlen
)
212 if (matchlen
> pathlen
) {
213 if (match
[pathlen
] != '/')
217 if (strncmp(path
, match
, pathlen
))
222 return 0; /* No matches */
225 static int diff_tree(void *tree1
, unsigned long size1
, void *tree2
, unsigned long size2
, const char *base
)
227 while (size1
| size2
) {
228 if (nr_paths
&& size1
&& !interesting(tree1
, size1
, base
)) {
229 update_tree_entry(&tree1
, &size1
);
232 if (nr_paths
&& size2
&& !interesting(tree2
, size2
, base
)) {
233 update_tree_entry(&tree2
, &size2
);
237 show_file("+", tree2
, size2
, base
);
238 update_tree_entry(&tree2
, &size2
);
242 show_file("-", tree1
, size1
, base
);
243 update_tree_entry(&tree1
, &size1
);
246 switch (compare_tree_entry(tree1
, size1
, tree2
, size2
, base
)) {
248 update_tree_entry(&tree1
, &size1
);
251 update_tree_entry(&tree1
, &size1
);
254 update_tree_entry(&tree2
, &size2
);
257 die("diff-tree: internal error");
262 static int diff_tree_sha1(const unsigned char *old
, const unsigned char *new, const char *base
)
265 unsigned long size1
, size2
;
268 tree1
= read_object_with_reference(old
, "tree", &size1
, 0);
270 die("unable to read source tree (%s)", sha1_to_hex(old
));
271 tree2
= read_object_with_reference(new, "tree", &size2
, 0);
273 die("unable to read destination tree (%s)", sha1_to_hex(new));
274 retval
= diff_tree(tree1
, size1
, tree2
, size2
, base
);
280 static int get_one_line(const char *msg
, unsigned long len
)
292 static int add_author_info(char *buf
, const char *line
, int len
)
295 unsigned int namelen
;
299 line
+= strlen("author ");
300 date
= strchr(line
, '>');
303 namelen
= ++date
- line
;
304 time
= strtoul(date
, &date
, 10);
305 tz
= strtol(date
, NULL
, 10);
307 return sprintf(buf
, "Author: %.*s\nDate: %s\n",
309 show_date(time
, tz
));
312 static char *generate_header(const char *commit
, const char *parent
, const char *msg
, unsigned long len
)
314 static char this_header
[1000];
317 offset
= sprintf(this_header
, "%s%s (from %s)\n", header_prefix
, commit
, parent
);
318 if (verbose_header
) {
322 const char *line
= msg
;
323 int linelen
= get_one_line(msg
, len
);
327 if (offset
+ linelen
+ 10 > sizeof(this_header
))
335 if (!memcmp(line
, "author ", 7))
336 offset
+= add_author_info(this_header
+ offset
, line
, linelen
);
339 memset(this_header
+ offset
, ' ', 4);
340 memcpy(this_header
+ offset
+ 4, line
, linelen
);
341 offset
+= linelen
+ 4;
343 this_header
[offset
++] = '\n';
344 this_header
[offset
] = 0;
350 static int diff_tree_commit(const unsigned char *commit
, const char *name
)
352 unsigned long size
, offset
;
353 char *buf
= read_object_with_reference(commit
, "commit", &size
, NULL
);
358 /* More than one parent? */
360 if (!memcmp(buf
+ 46 + 48, "parent ", 7))
365 static char commit_name
[60];
366 strcpy(commit_name
, sha1_to_hex(commit
));
371 while (offset
+ 48 < size
&& !memcmp(buf
+ offset
, "parent ", 7)) {
372 unsigned char parent
[20];
373 if (get_sha1_hex(buf
+ offset
+ 7, parent
))
375 header
= generate_header(name
, sha1_to_hex(parent
), buf
, size
);
376 diff_tree_sha1(parent
, commit
, "");
377 if (!header
&& verbose_header
)
378 header_prefix
= "\ndiff-tree ";
384 static int diff_tree_stdin(char *line
)
386 int len
= strlen(line
);
387 unsigned char commit
[20], parent
[20];
388 static char this_header
[1000];
390 if (!len
|| line
[len
-1] != '\n')
393 if (get_sha1_hex(line
, commit
))
395 if (isspace(line
[40]) && !get_sha1_hex(line
+41, parent
)) {
398 sprintf(this_header
, "%s (from %s)\n", line
, line
+41);
399 header
= this_header
;
400 return diff_tree_sha1(parent
, commit
, "");
403 return diff_tree_commit(commit
, line
);
406 static char *diff_tree_usage
=
407 "diff-tree [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] <tree sha1> <tree sha1>";
409 int main(int argc
, char **argv
)
413 unsigned char sha1
[2][20];
426 if (nr_sha1
< 2 && !get_sha1(arg
, sha1
[nr_sha1
])) {
433 if (!strcmp(arg
, "--")) {
438 if (!strcmp(arg
, "-r")) {
442 if (!strcmp(arg
, "-p")) {
443 recursive
= generate_patch
= 1;
446 if (!strcmp(arg
, "-z")) {
447 line_termination
= '\0';
450 if (!strcmp(arg
, "-m")) {
454 if (!strcmp(arg
, "-s")) {
458 if (!strcmp(arg
, "-v")) {
460 header_prefix
= "diff-tree ";
463 if (!strcmp(arg
, "--stdin")) {
467 usage(diff_tree_usage
);
475 pathlens
= xmalloc(nr_paths
* sizeof(int));
476 for (i
=0; i
<nr_paths
; i
++)
477 pathlens
[i
] = strlen(paths
[i
]);
483 usage(diff_tree_usage
);
486 diff_tree_commit(sha1
[0], NULL
);
489 diff_tree_sha1(sha1
[0], sha1
[1], "");
496 while (fgets(line
, sizeof(line
), stdin
))
497 diff_tree_stdin(line
);