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 show_tree_entry_in_recursive
= 0;
11 static int read_stdin
= 0;
12 static int diff_output_format
= DIFF_FORMAT_HUMAN
;
13 static int detect_rename
= 0;
14 static int diff_setup_opt
= 0;
15 static int diff_score_opt
= 0;
16 static const char *pickaxe
= NULL
;
17 static int pickaxe_opts
= 0;
18 static int diff_break_opt
= -1;
19 static const char *orderfile
= NULL
;
20 static const char *header
= NULL
;
21 static const char *header_prefix
= "";
23 // What paths are we interested in?
24 static int nr_paths
= 0;
25 static const char **paths
= NULL
;
26 static int *pathlens
= NULL
;
28 static int diff_tree_sha1(const unsigned char *old
, const unsigned char *new, const char *base
);
30 static void update_tree_entry(void **bufp
, unsigned long *sizep
)
33 unsigned long size
= *sizep
;
34 int len
= strlen(buf
) + 1 + 20;
37 die("corrupt tree file");
42 static const unsigned char *extract(void *tree
, unsigned long size
, const char **pathp
, unsigned int *modep
)
44 int len
= strlen(tree
)+1;
45 const unsigned char *sha1
= tree
+ len
;
46 const char *path
= strchr(tree
, ' ');
48 if (!path
|| size
< len
+ 20 || sscanf(tree
, "%o", modep
) != 1)
49 die("corrupt tree file");
54 static char *malloc_base(const char *base
, const char *path
, int pathlen
)
56 int baselen
= strlen(base
);
57 char *newbase
= xmalloc(baselen
+ pathlen
+ 2);
58 memcpy(newbase
, base
, baselen
);
59 memcpy(newbase
+ baselen
, path
, pathlen
);
60 memcpy(newbase
+ baselen
+ pathlen
, "/", 2);
64 static void show_file(const char *prefix
, void *tree
, unsigned long size
, const char *base
);
65 static void show_tree(const char *prefix
, void *tree
, unsigned long size
, const char *base
);
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
);
74 if (recursive
&& S_ISDIR(mode
)) {
77 char *newbase
= malloc_base(base
, path
, strlen(path
));
80 tree
= read_sha1_file(sha1
, type
, &size
);
81 if (!tree
|| strcmp(type
, "tree"))
82 die("corrupt tree sha %s", sha1_to_hex(sha1
));
84 show_tree(prefix
, tree
, size
, newbase
);
91 diff_addremove(prefix
[0], mode
, sha1
, base
, path
);
94 static int compare_tree_entry(void *tree1
, unsigned long size1
, void *tree2
, unsigned long size2
, const char *base
)
96 unsigned mode1
, mode2
;
97 const char *path1
, *path2
;
98 const unsigned char *sha1
, *sha2
;
99 int cmp
, pathlen1
, pathlen2
;
101 sha1
= extract(tree1
, size1
, &path1
, &mode1
);
102 sha2
= extract(tree2
, size2
, &path2
, &mode2
);
104 pathlen1
= strlen(path1
);
105 pathlen2
= strlen(path2
);
106 cmp
= base_name_compare(path1
, pathlen1
, mode1
, path2
, pathlen2
, mode2
);
108 show_file("-", tree1
, size1
, base
);
112 show_file("+", tree2
, size2
, base
);
115 if (!memcmp(sha1
, sha2
, 20) && mode1
== mode2
)
119 * If the filemode has changed to/from a directory from/to a regular
120 * file, we need to consider it a remove and an add.
122 if (S_ISDIR(mode1
) != S_ISDIR(mode2
)) {
123 show_file("-", tree1
, size1
, base
);
124 show_file("+", tree2
, size2
, base
);
128 if (recursive
&& S_ISDIR(mode1
)) {
130 char *newbase
= malloc_base(base
, path1
, pathlen1
);
131 if (show_tree_entry_in_recursive
)
132 diff_change(mode1
, mode2
, sha1
, sha2
, base
, path1
);
133 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(diff_setup_opt
);
265 static int call_diff_flush(void)
268 detect_rename
, diff_score_opt
,
269 pickaxe
, pickaxe_opts
,
272 if (diff_queue_is_empty()) {
273 diff_flush(DIFF_FORMAT_NO_OUTPUT
, 0);
277 const char *fmt
= "%s";
278 if (diff_output_format
== DIFF_FORMAT_MACHINE
)
281 printf(fmt
, header
, 0);
284 diff_flush(diff_output_format
, 1);
288 static int diff_tree_sha1_top(const unsigned char *old
,
289 const unsigned char *new, const char *base
)
294 ret
= diff_tree_sha1(old
, new, base
);
299 static int diff_root_tree(const unsigned char *new, const char *base
)
306 tree
= read_object_with_reference(new, "tree", &size
, NULL
);
308 die("unable to read root tree (%s)", sha1_to_hex(new));
309 retval
= diff_tree("", 0, tree
, size
, base
);
315 static char *generate_header(const char *commit
, const char *parent
, const char *msg
, unsigned long len
)
317 static char this_header
[16384];
320 offset
= sprintf(this_header
, "%s%s (from %s)\n", header_prefix
, commit
, parent
);
321 if (verbose_header
) {
322 offset
+= pretty_print_commit(msg
, len
, this_header
+ offset
, sizeof(this_header
) - offset
);
323 this_header
[offset
++] = '\n';
324 this_header
[offset
++] = 0;
330 static int diff_tree_commit(const unsigned char *commit
, const char *name
)
332 unsigned long size
, offset
;
333 char *buf
= read_object_with_reference(commit
, "commit", &size
, NULL
);
339 static char commit_name
[60];
340 strcpy(commit_name
, sha1_to_hex(commit
));
345 if (show_root_diff
&& memcmp(buf
+ 46, "parent ", 7)) {
346 header
= generate_header(name
, "root", buf
, size
);
347 diff_root_tree(commit
, "");
350 /* More than one parent? */
352 if (!memcmp(buf
+ 46 + 48, "parent ", 7))
357 while (offset
+ 48 < size
&& !memcmp(buf
+ offset
, "parent ", 7)) {
358 unsigned char parent
[20];
359 if (get_sha1_hex(buf
+ offset
+ 7, parent
))
361 header
= generate_header(name
, sha1_to_hex(parent
), buf
, size
);
362 diff_tree_sha1_top(parent
, commit
, "");
363 if (!header
&& verbose_header
) {
364 header_prefix
= "\ndiff-tree ";
366 * Don't print multiple merge entries if we
367 * don't print the diffs.
375 static int diff_tree_stdin(char *line
)
377 int len
= strlen(line
);
378 unsigned char commit
[20], parent
[20];
379 static char this_header
[1000];
381 if (!len
|| line
[len
-1] != '\n')
384 if (get_sha1_hex(line
, commit
))
386 if (isspace(line
[40]) && !get_sha1_hex(line
+41, parent
)) {
389 sprintf(this_header
, "%s (from %s)\n", line
, line
+41);
390 header
= this_header
;
391 return diff_tree_sha1_top(parent
, commit
, "");
394 return diff_tree_commit(commit
, line
);
397 static char *diff_tree_usage
=
398 "git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] [-t] <tree-ish> <tree-ish>";
400 int main(int argc
, const char **argv
)
404 unsigned char sha1
[2][20];
417 if (nr_sha1
< 2 && !get_sha1(arg
, sha1
[nr_sha1
])) {
424 if (!strcmp(arg
, "--")) {
429 if (!strcmp(arg
, "-r")) {
433 if (!strcmp(arg
, "-t")) {
434 recursive
= show_tree_entry_in_recursive
= 1;
437 if (!strcmp(arg
, "-R")) {
438 diff_setup_opt
|= DIFF_SETUP_REVERSE
;
441 if (!strcmp(arg
, "-p")) {
442 diff_output_format
= DIFF_FORMAT_PATCH
;
446 if (!strncmp(arg
, "-S", 2)) {
450 if (!strncmp(arg
, "-O", 2)) {
454 if (!strcmp(arg
, "--pickaxe-all")) {
455 pickaxe_opts
= DIFF_PICKAXE_ALL
;
458 if (!strncmp(arg
, "-M", 2)) {
459 detect_rename
= DIFF_DETECT_RENAME
;
460 diff_score_opt
= diff_scoreopt_parse(arg
);
463 if (!strncmp(arg
, "-C", 2)) {
464 detect_rename
= DIFF_DETECT_COPY
;
465 diff_score_opt
= diff_scoreopt_parse(arg
);
468 if (!strncmp(arg
, "-B", 2)) {
469 diff_break_opt
= diff_scoreopt_parse(arg
);
472 if (!strcmp(arg
, "-z")) {
473 diff_output_format
= DIFF_FORMAT_MACHINE
;
476 if (!strcmp(arg
, "-m")) {
480 if (!strcmp(arg
, "-s")) {
481 diff_output_format
= DIFF_FORMAT_NO_OUTPUT
;
484 if (!strcmp(arg
, "-v")) {
486 header_prefix
= "diff-tree ";
489 if (!strcmp(arg
, "--stdin")) {
493 if (!strcmp(arg
, "--root")) {
497 usage(diff_tree_usage
);
505 pathlens
= xmalloc(nr_paths
* sizeof(int));
506 for (i
=0; i
<nr_paths
; i
++)
507 pathlens
[i
] = strlen(paths
[i
]);
513 usage(diff_tree_usage
);
516 diff_tree_commit(sha1
[0], NULL
);
519 diff_tree_sha1_top(sha1
[0], sha1
[1], "");
527 diff_setup_opt
|= (DIFF_SETUP_USE_SIZE_CACHE
|
528 DIFF_SETUP_USE_CACHE
);
529 while (fgets(line
, sizeof(line
), stdin
))
530 diff_tree_stdin(line
);