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 find_copies_harder = 0;
15 static int diff_setup_opt = 0;
16 static int diff_score_opt = 0;
17 static const char *pickaxe = NULL;
18 static int pickaxe_opts = 0;
19 static int diff_break_opt = -1;
20 static const char *orderfile = NULL;
21 static const char *diff_filter = NULL;
22 static const char *header = NULL;
23 static const char *header_prefix = "";
24 static enum cmit_fmt commit_format = CMIT_FMT_RAW;
26 // What paths are we interested in?
27 static int nr_paths = 0;
28 static const char **paths = NULL;
29 static int *pathlens = NULL;
31 static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base);
33 static void update_tree_entry(void **bufp, unsigned long *sizep)
36 unsigned long size = *sizep;
37 int len = strlen(buf) + 1 + 20;
40 die("corrupt tree file");
45 static const unsigned char *extract(void *tree, unsigned long size, const char **pathp, unsigned int *modep)
47 int len = strlen(tree)+1;
48 const unsigned char *sha1 = tree + len;
49 const char *path = strchr(tree, ' ');
52 if (!path || size < len + 20 || sscanf(tree, "%o", &mode) != 1)
53 die("corrupt tree file");
55 *modep = DIFF_FILE_CANON_MODE(mode);
59 static char *malloc_base(const char *base, const char *path, int pathlen)
61 int baselen = strlen(base);
62 char *newbase = xmalloc(baselen + pathlen + 2);
63 memcpy(newbase, base, baselen);
64 memcpy(newbase + baselen, path, pathlen);
65 memcpy(newbase + baselen + pathlen, "/", 2);
69 static void show_file(const char *prefix, void *tree, unsigned long size, const char *base);
70 static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base);
72 /* A file entry went away or appeared */
73 static void show_file(const char *prefix, void *tree, unsigned long size, const char *base)
77 const unsigned char *sha1 = extract(tree, size, &path, &mode);
79 if (recursive && S_ISDIR(mode)) {
82 char *newbase = malloc_base(base, path, strlen(path));
85 tree = read_sha1_file(sha1, type, &size);
86 if (!tree || strcmp(type, "tree"))
87 die("corrupt tree sha %s", sha1_to_hex(sha1));
89 show_tree(prefix, tree, size, newbase);
96 diff_addremove(prefix[0], mode, sha1, base, path);
99 static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
101 unsigned mode1, mode2;
102 const char *path1, *path2;
103 const unsigned char *sha1, *sha2;
104 int cmp, pathlen1, pathlen2;
106 sha1 = extract(tree1, size1, &path1, &mode1);
107 sha2 = extract(tree2, size2, &path2, &mode2);
109 pathlen1 = strlen(path1);
110 pathlen2 = strlen(path2);
111 cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2);
113 show_file("-", tree1, size1, base);
117 show_file("+", tree2, size2, base);
120 if (!find_copies_harder && !memcmp(sha1, sha2, 20) && mode1 == mode2)
124 * If the filemode has changed to/from a directory from/to a regular
125 * file, we need to consider it a remove and an add.
127 if (S_ISDIR(mode1) != S_ISDIR(mode2)) {
128 show_file("-", tree1, size1, base);
129 show_file("+", tree2, size2, base);
133 if (recursive && S_ISDIR(mode1)) {
135 char *newbase = malloc_base(base, path1, pathlen1);
136 if (show_tree_entry_in_recursive)
137 diff_change(mode1, mode2, sha1, sha2, base, path1);
138 retval = diff_tree_sha1(sha1, sha2, newbase);
143 diff_change(mode1, mode2, sha1, sha2, base, path1);
147 static int interesting(void *tree, unsigned long size, const char *base)
152 int baselen, pathlen;
157 (void)extract(tree, size, &path, &mode);
159 pathlen = strlen(path);
160 baselen = strlen(base);
162 for (i=0; i < nr_paths; i++) {
163 const char *match = paths[i];
164 int matchlen = pathlens[i];
166 if (baselen >= matchlen) {
167 /* If it doesn't match, move along... */
168 if (strncmp(base, match, matchlen))
171 /* The base is a subdirectory of a path which was specified. */
175 /* Does the base match? */
176 if (strncmp(base, match, baselen))
182 if (pathlen > matchlen)
185 if (matchlen > pathlen) {
186 if (match[pathlen] != '/')
192 if (strncmp(path, match, pathlen))
197 return 0; /* No matches */
200 /* A whole sub-tree went away or appeared */
201 static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base)
204 if (interesting(tree, size, base))
205 show_file(prefix, tree, size, base);
206 update_tree_entry(&tree, &size);
210 static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
212 while (size1 | size2) {
213 if (nr_paths && size1 && !interesting(tree1, size1, base)) {
214 update_tree_entry(&tree1, &size1);
217 if (nr_paths && size2 && !interesting(tree2, size2, base)) {
218 update_tree_entry(&tree2, &size2);
222 show_file("+", tree2, size2, base);
223 update_tree_entry(&tree2, &size2);
227 show_file("-", tree1, size1, base);
228 update_tree_entry(&tree1, &size1);
231 switch (compare_tree_entry(tree1, size1, tree2, size2, base)) {
233 update_tree_entry(&tree1, &size1);
236 update_tree_entry(&tree1, &size1);
239 update_tree_entry(&tree2, &size2);
242 die("git-diff-tree: internal error");
247 static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base)
250 unsigned long size1, size2;
253 tree1 = read_object_with_reference(old, "tree", &size1, NULL);
255 die("unable to read source tree (%s)", sha1_to_hex(old));
256 tree2 = read_object_with_reference(new, "tree", &size2, NULL);
258 die("unable to read destination tree (%s)", sha1_to_hex(new));
259 retval = diff_tree(tree1, size1, tree2, size2, base);
265 static void call_diff_setup(void)
267 diff_setup(diff_setup_opt);
270 static int call_diff_flush(void)
273 detect_rename, diff_score_opt,
274 pickaxe, pickaxe_opts,
278 if (diff_queue_is_empty()) {
279 diff_flush(DIFF_FORMAT_NO_OUTPUT);
283 printf("%s%c", header, diff_output_format == DIFF_FORMAT_MACHINE ? 0 : '\n');
286 diff_flush(diff_output_format);
290 static int diff_tree_sha1_top(const unsigned char *old,
291 const unsigned char *new, const char *base)
296 ret = diff_tree_sha1(old, new, base);
301 static int diff_root_tree(const unsigned char *new, const char *base)
308 tree = read_object_with_reference(new, "tree", &size, NULL);
310 die("unable to read root tree (%s)", sha1_to_hex(new));
311 retval = diff_tree("", 0, tree, size, base);
317 static const char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
319 static char this_header[16384];
325 offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
326 offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset);
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] [-s] [-v] [--pretty] [-t] [-R] [-B] [-M] [-C] [--find-copies-header] [-O<orderfile>] [-S<string>] [--pickaxe-all] <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 (!strncmp(arg, "--diff-filter=", 14)) {
455 diff_filter = arg + 14;
458 if (!strcmp(arg, "--pickaxe-all")) {
459 pickaxe_opts = DIFF_PICKAXE_ALL;
462 if (!strncmp(arg, "-M", 2)) {
463 detect_rename = DIFF_DETECT_RENAME;
464 if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
465 usage(diff_tree_usage);
468 if (!strncmp(arg, "-C", 2)) {
469 detect_rename = DIFF_DETECT_COPY;
470 if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
471 usage(diff_tree_usage);
474 if (!strncmp(arg, "-B", 2)) {
475 if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
476 usage(diff_tree_usage);
479 if (!strcmp(arg, "--find-copies-harder")) {
480 find_copies_harder = 1;
483 if (!strcmp(arg, "-z")) {
484 diff_output_format = DIFF_FORMAT_MACHINE;
487 if (!strcmp(arg, "-m")) {
491 if (!strcmp(arg, "-s")) {
492 diff_output_format = DIFF_FORMAT_NO_OUTPUT;
495 if (!strcmp(arg, "-v")) {
497 header_prefix = "diff-tree ";
500 if (!strncmp(arg, "--pretty", 8)) {
502 header_prefix = "diff-tree ";
503 commit_format = get_commit_format(arg+8);
506 if (!strcmp(arg, "--stdin")) {
510 if (!strcmp(arg, "--root")) {
514 usage(diff_tree_usage);
516 if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
517 usage(diff_tree_usage);
524 pathlens = xmalloc(nr_paths * sizeof(int));
525 for (i=0; i<nr_paths; i++)
526 pathlens[i] = strlen(paths[i]);
532 usage(diff_tree_usage);
535 diff_tree_commit(sha1[0], NULL);
538 diff_tree_sha1_top(sha1[0], sha1[1], "");
546 diff_setup_opt |= (DIFF_SETUP_USE_SIZE_CACHE |
547 DIFF_SETUP_USE_CACHE);
548 while (fgets(line, sizeof(line), stdin))
549 diff_tree_stdin(line);