6 static int show_root_diff
= 0;
7 static int verbose_header
= 0;
8 static int ignore_merges
= 1;
9 static int recursive
= 0;
10 static int read_stdin
= 0;
11 static int diff_output_format
= DIFF_FORMAT_HUMAN
;
12 static int detect_rename
= 0;
13 static int reverse_diff
= 0;
14 static int diff_score_opt
= 0;
15 static const char *pickaxe
= NULL
;
16 static const char *header
= NULL
;
17 static const char *header_prefix
= "";
19 // What paths are we interested in?
20 static int nr_paths
= 0;
21 static const char **paths
= NULL
;
22 static int *pathlens
= NULL
;
24 static int diff_tree_sha1(const unsigned char *old
, const unsigned char *new, const char *base
);
26 static void update_tree_entry(void **bufp
, unsigned long *sizep
)
29 unsigned long size
= *sizep
;
30 int len
= strlen(buf
) + 1 + 20;
33 die("corrupt tree file");
38 static const unsigned char *extract(void *tree
, unsigned long size
, const char **pathp
, unsigned int *modep
)
40 int len
= strlen(tree
)+1;
41 const unsigned char *sha1
= tree
+ len
;
42 const char *path
= strchr(tree
, ' ');
44 if (!path
|| size
< len
+ 20 || sscanf(tree
, "%o", modep
) != 1)
45 die("corrupt tree file");
50 static char *malloc_base(const char *base
, const char *path
, int pathlen
)
52 int baselen
= strlen(base
);
53 char *newbase
= xmalloc(baselen
+ pathlen
+ 2);
54 memcpy(newbase
, base
, baselen
);
55 memcpy(newbase
+ baselen
, path
, pathlen
);
56 memcpy(newbase
+ baselen
+ pathlen
, "/", 2);
60 static void show_file(const char *prefix
, void *tree
, unsigned long size
, const char *base
);
61 static void show_tree(const char *prefix
, void *tree
, unsigned long size
, const char *base
);
63 /* A file entry went away or appeared */
64 static void show_file(const char *prefix
, void *tree
, unsigned long size
, const char *base
)
68 const unsigned char *sha1
= extract(tree
, size
, &path
, &mode
);
73 if (recursive
&& S_ISDIR(mode
)) {
76 char *newbase
= malloc_base(base
, path
, strlen(path
));
79 tree
= read_sha1_file(sha1
, type
, &size
);
80 if (!tree
|| strcmp(type
, "tree"))
81 die("corrupt tree sha %s", sha1_to_hex(sha1
));
83 show_tree(prefix
, tree
, size
, newbase
);
90 diff_addremove(prefix
[0], mode
, sha1
, base
, path
);
93 static int compare_tree_entry(void *tree1
, unsigned long size1
, void *tree2
, unsigned long size2
, const char *base
)
95 unsigned mode1
, mode2
;
96 const char *path1
, *path2
;
97 const unsigned char *sha1
, *sha2
;
98 int cmp
, pathlen1
, pathlen2
;
100 sha1
= extract(tree1
, size1
, &path1
, &mode1
);
101 sha2
= extract(tree2
, size2
, &path2
, &mode2
);
103 pathlen1
= strlen(path1
);
104 pathlen2
= strlen(path2
);
105 cmp
= base_name_compare(path1
, pathlen1
, mode1
, path2
, pathlen2
, mode2
);
107 show_file("-", tree1
, size1
, base
);
111 show_file("+", tree2
, size2
, base
);
114 if (!memcmp(sha1
, sha2
, 20) && mode1
== mode2
)
118 * If the filemode has changed to/from a directory from/to a regular
119 * file, we need to consider it a remove and an add.
121 if (S_ISDIR(mode1
) != S_ISDIR(mode2
)) {
122 show_file("-", tree1
, size1
, base
);
123 show_file("+", tree2
, size2
, base
);
127 if (recursive
&& S_ISDIR(mode1
)) {
129 char *newbase
= malloc_base(base
, path1
, pathlen1
);
130 retval
= diff_tree_sha1(sha1
, sha2
, newbase
);
138 diff_change(mode1
, mode2
, sha1
, sha2
, base
, path1
);
142 static int interesting(void *tree
, unsigned long size
, const char *base
)
147 int baselen
, pathlen
;
152 (void)extract(tree
, size
, &path
, &mode
);
154 pathlen
= strlen(path
);
155 baselen
= strlen(base
);
157 for (i
=0; i
< nr_paths
; i
++) {
158 const char *match
= paths
[i
];
159 int matchlen
= pathlens
[i
];
161 if (baselen
>= matchlen
) {
162 /* If it doesn't match, move along... */
163 if (strncmp(base
, match
, matchlen
))
166 /* The base is a subdirectory of a path which was specified. */
170 /* Does the base match? */
171 if (strncmp(base
, match
, baselen
))
177 if (pathlen
> matchlen
)
180 if (matchlen
> pathlen
) {
181 if (match
[pathlen
] != '/')
187 if (strncmp(path
, match
, pathlen
))
192 return 0; /* No matches */
195 /* A whole sub-tree went away or appeared */
196 static void show_tree(const char *prefix
, void *tree
, unsigned long size
, const char *base
)
199 if (interesting(tree
, size
, base
))
200 show_file(prefix
, tree
, size
, base
);
201 update_tree_entry(&tree
, &size
);
205 static int diff_tree(void *tree1
, unsigned long size1
, void *tree2
, unsigned long size2
, const char *base
)
207 while (size1
| size2
) {
208 if (nr_paths
&& size1
&& !interesting(tree1
, size1
, base
)) {
209 update_tree_entry(&tree1
, &size1
);
212 if (nr_paths
&& size2
&& !interesting(tree2
, size2
, base
)) {
213 update_tree_entry(&tree2
, &size2
);
217 show_file("+", tree2
, size2
, base
);
218 update_tree_entry(&tree2
, &size2
);
222 show_file("-", tree1
, size1
, base
);
223 update_tree_entry(&tree1
, &size1
);
226 switch (compare_tree_entry(tree1
, size1
, tree2
, size2
, base
)) {
228 update_tree_entry(&tree1
, &size1
);
231 update_tree_entry(&tree1
, &size1
);
234 update_tree_entry(&tree2
, &size2
);
237 die("git-diff-tree: internal error");
242 static int diff_tree_sha1(const unsigned char *old
, const unsigned char *new, const char *base
)
245 unsigned long size1
, size2
;
248 tree1
= read_object_with_reference(old
, "tree", &size1
, NULL
);
250 die("unable to read source tree (%s)", sha1_to_hex(old
));
251 tree2
= read_object_with_reference(new, "tree", &size2
, NULL
);
253 die("unable to read destination tree (%s)", sha1_to_hex(new));
254 retval
= diff_tree(tree1
, size1
, tree2
, size2
, base
);
260 static void call_diff_setup(void)
262 diff_setup(reverse_diff
);
265 static int call_diff_flush(void)
268 diffcore_rename(detect_rename
, diff_score_opt
);
271 diffcore_pickaxe(pickaxe
);
272 if (diff_queue_is_empty()) {
273 diff_flush(DIFF_FORMAT_NO_OUTPUT
, 0);
278 diffcore_pathspec(paths
);
280 if (diff_output_format
== DIFF_FORMAT_MACHINE
) {
282 for (cp
= header
; *cp
; cp
= ep
) {
283 ep
= strchr(cp
, '\n');
284 if (ep
== 0) ep
= cp
+ strlen(cp
);
285 printf("%.*s%c", ep
-cp
, cp
, 0);
290 printf("%s", header
);
294 diff_flush(diff_output_format
, 1);
298 static int diff_tree_sha1_top(const unsigned char *old
,
299 const unsigned char *new, const char *base
)
304 ret
= diff_tree_sha1(old
, new, base
);
309 static int diff_root_tree(const unsigned char *new, const char *base
)
316 tree
= read_object_with_reference(new, "tree", &size
, NULL
);
318 die("unable to read root tree (%s)", sha1_to_hex(new));
319 retval
= diff_tree("", 0, tree
, size
, base
);
325 static int get_one_line(const char *msg
, unsigned long len
)
337 static int add_author_info(char *buf
, const char *line
, int len
)
340 unsigned int namelen
;
344 line
+= strlen("author ");
345 date
= strchr(line
, '>');
348 namelen
= ++date
- line
;
349 time
= strtoul(date
, &date
, 10);
350 tz
= strtol(date
, NULL
, 10);
352 return sprintf(buf
, "Author: %.*s\nDate: %s\n",
354 show_date(time
, tz
));
357 static char *generate_header(const char *commit
, const char *parent
, const char *msg
, unsigned long len
)
359 static char this_header
[16384];
362 offset
= sprintf(this_header
, "%s%s (from %s)\n", header_prefix
, commit
, parent
);
363 if (verbose_header
) {
367 const char *line
= msg
;
368 int linelen
= get_one_line(msg
, len
);
374 * We want some slop for indentation and a possible
375 * final "...". Thus the "+ 20".
377 if (offset
+ linelen
+ 20 > sizeof(this_header
)) {
378 memcpy(this_header
+ offset
, " ...\n", 8);
388 if (!memcmp(line
, "author ", 7))
389 offset
+= add_author_info(this_header
+ offset
, line
, linelen
);
392 memset(this_header
+ offset
, ' ', 4);
393 memcpy(this_header
+ offset
+ 4, line
, linelen
);
394 offset
+= linelen
+ 4;
396 /* Make sure there is an EOLN */
397 if (this_header
[offset
-1] != '\n')
398 this_header
[offset
++] = '\n';
399 /* Add _another_ EOLN if we are doing diff output */
401 this_header
[offset
++] = '\n';
402 this_header
[offset
] = 0;
408 static int diff_tree_commit(const unsigned char *commit
, const char *name
)
410 unsigned long size
, offset
;
411 char *buf
= read_object_with_reference(commit
, "commit", &size
, NULL
);
417 static char commit_name
[60];
418 strcpy(commit_name
, sha1_to_hex(commit
));
423 if (show_root_diff
&& memcmp(buf
+ 46, "parent ", 7)) {
424 header
= generate_header(name
, "root", buf
, size
);
425 diff_root_tree(commit
, "");
428 /* More than one parent? */
430 if (!memcmp(buf
+ 46 + 48, "parent ", 7))
435 while (offset
+ 48 < size
&& !memcmp(buf
+ offset
, "parent ", 7)) {
436 unsigned char parent
[20];
437 if (get_sha1_hex(buf
+ offset
+ 7, parent
))
439 header
= generate_header(name
, sha1_to_hex(parent
), buf
, size
);
440 diff_tree_sha1_top(parent
, commit
, "");
441 if (!header
&& verbose_header
) {
442 header_prefix
= "\ndiff-tree ";
444 * Don't print multiple merge entries if we
445 * don't print the diffs.
455 static int diff_tree_stdin(char *line
)
457 int len
= strlen(line
);
458 unsigned char commit
[20], parent
[20];
459 static char this_header
[1000];
461 if (!len
|| line
[len
-1] != '\n')
464 if (get_sha1_hex(line
, commit
))
466 if (isspace(line
[40]) && !get_sha1_hex(line
+41, parent
)) {
469 sprintf(this_header
, "%s (from %s)\n", line
, line
+41);
470 header
= this_header
;
471 return diff_tree_sha1_top(parent
, commit
, "");
474 return diff_tree_commit(commit
, line
);
477 static char *diff_tree_usage
=
478 "git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] <tree-ish> <tree-ish>";
480 int main(int argc
, const char **argv
)
484 unsigned char sha1
[2][20];
497 if (nr_sha1
< 2 && !get_sha1(arg
, sha1
[nr_sha1
])) {
504 if (!strcmp(arg
, "--")) {
509 if (!strcmp(arg
, "-r")) {
513 if (!strcmp(arg
, "-R")) {
517 if (!strcmp(arg
, "-p")) {
518 diff_output_format
= DIFF_FORMAT_PATCH
;
522 if (!strncmp(arg
, "-S", 2)) {
526 if (!strncmp(arg
, "-M", 2)) {
527 detect_rename
= DIFF_DETECT_RENAME
;
528 diff_score_opt
= diff_scoreopt_parse(arg
);
531 if (!strncmp(arg
, "-C", 2)) {
532 detect_rename
= DIFF_DETECT_COPY
;
533 diff_score_opt
= diff_scoreopt_parse(arg
);
536 if (!strcmp(arg
, "-z")) {
537 diff_output_format
= DIFF_FORMAT_MACHINE
;
540 if (!strcmp(arg
, "-m")) {
544 if (!strcmp(arg
, "-s")) {
548 if (!strcmp(arg
, "-v")) {
550 header_prefix
= "diff-tree ";
553 if (!strcmp(arg
, "--stdin")) {
557 if (!strcmp(arg
, "--root")) {
561 usage(diff_tree_usage
);
569 pathlens
= xmalloc(nr_paths
* sizeof(int));
570 for (i
=0; i
<nr_paths
; i
++)
571 pathlens
[i
] = strlen(paths
[i
]);
577 usage(diff_tree_usage
);
580 diff_tree_commit(sha1
[0], NULL
);
583 diff_tree_sha1_top(sha1
[0], sha1
[1], "");
590 while (fgets(line
, sizeof(line
), stdin
))
591 diff_tree_stdin(line
);