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);
278 diffcore_pathspec(paths);
280 printf("%s", header);
283 diff_flush(diff_output_format);
287 static int diff_tree_sha1_top(const unsigned char *old,
288 const unsigned char *new, const char *base)
293 ret = diff_tree_sha1(old, new, base);
298 static int diff_root_tree(const unsigned char *new, const char *base)
305 tree = read_object_with_reference(new, "tree", &size, NULL);
307 die("unable to read root tree (%s)", sha1_to_hex(new));
308 retval = diff_tree("", 0, tree, size, base);
314 static int get_one_line(const char *msg, unsigned long len)
326 static int add_author_info(char *buf, const char *line, int len)
329 unsigned int namelen;
333 line += strlen("author ");
334 date = strchr(line, '>');
337 namelen = ++date - line;
338 time = strtoul(date, &date, 10);
339 tz = strtol(date, NULL, 10);
341 return sprintf(buf, "Author: %.*s\nDate: %s\n",
343 show_date(time, tz));
346 static char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
348 static char this_header[16384];
351 offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
352 if (verbose_header) {
356 const char *line = msg;
357 int linelen = get_one_line(msg, len);
363 * We want some slop for indentation and a possible
364 * final "...". Thus the "+ 20".
366 if (offset + linelen + 20 > sizeof(this_header)) {
367 memcpy(this_header + offset, " ...\n", 8);
377 if (!memcmp(line, "author ", 7))
378 offset += add_author_info(this_header + offset, line, linelen);
381 memset(this_header + offset, ' ', 4);
382 memcpy(this_header + offset + 4, line, linelen);
383 offset += linelen + 4;
385 /* Make sure there is an EOLN */
386 if (this_header[offset-1] != '\n')
387 this_header[offset++] = '\n';
388 /* Add _another_ EOLN if we are doing diff output */
390 this_header[offset++] = '\n';
391 this_header[offset] = 0;
397 static int diff_tree_commit(const unsigned char *commit, const char *name)
399 unsigned long size, offset;
400 char *buf = read_object_with_reference(commit, "commit", &size, NULL);
406 static char commit_name[60];
407 strcpy(commit_name, sha1_to_hex(commit));
412 if (show_root_diff && memcmp(buf + 46, "parent ", 7)) {
413 header = generate_header(name, "root", buf, size);
414 diff_root_tree(commit, "");
417 /* More than one parent? */
419 if (!memcmp(buf + 46 + 48, "parent ", 7))
424 while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
425 unsigned char parent[20];
426 if (get_sha1_hex(buf + offset + 7, parent))
428 header = generate_header(name, sha1_to_hex(parent), buf, size);
429 diff_tree_sha1_top(parent, commit, "");
430 if (!header && verbose_header) {
431 header_prefix = "\ndiff-tree ";
433 * Don't print multiple merge entries if we
434 * don't print the diffs.
444 static int diff_tree_stdin(char *line)
446 int len = strlen(line);
447 unsigned char commit[20], parent[20];
448 static char this_header[1000];
450 if (!len || line[len-1] != '\n')
453 if (get_sha1_hex(line, commit))
455 if (isspace(line[40]) && !get_sha1_hex(line+41, parent)) {
458 sprintf(this_header, "%s (from %s)\n", line, line+41);
459 header = this_header;
460 return diff_tree_sha1_top(parent, commit, "");
463 return diff_tree_commit(commit, line);
466 static char *diff_tree_usage =
467 "git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] <tree-ish> <tree-ish>";
469 int main(int argc, const char **argv)
473 unsigned char sha1[2][20];
486 if (nr_sha1 < 2 && !get_sha1(arg, sha1[nr_sha1])) {
493 if (!strcmp(arg, "--")) {
498 if (!strcmp(arg, "-r")) {
502 if (!strcmp(arg, "-R")) {
506 if (!strcmp(arg, "-p")) {
507 diff_output_format = DIFF_FORMAT_PATCH;
511 if (!strncmp(arg, "-S", 2)) {
515 if (!strncmp(arg, "-M", 2)) {
516 detect_rename = DIFF_DETECT_RENAME;
517 diff_score_opt = diff_scoreopt_parse(arg);
520 if (!strncmp(arg, "-C", 2)) {
521 detect_rename = DIFF_DETECT_COPY;
522 diff_score_opt = diff_scoreopt_parse(arg);
525 if (!strcmp(arg, "-z")) {
526 diff_output_format = DIFF_FORMAT_MACHINE;
529 if (!strcmp(arg, "-m")) {
533 if (!strcmp(arg, "-s")) {
537 if (!strcmp(arg, "-v")) {
539 header_prefix = "diff-tree ";
542 if (!strcmp(arg, "--stdin")) {
546 if (!strcmp(arg, "--root")) {
550 usage(diff_tree_usage);
558 pathlens = xmalloc(nr_paths * sizeof(int));
559 for (i=0; i<nr_paths; i++)
560 pathlens[i] = strlen(paths[i]);
566 usage(diff_tree_usage);
569 diff_tree_commit(sha1[0], NULL);
572 diff_tree_sha1_top(sha1[0], sha1[1], "");
579 while (fgets(line, sizeof(line), stdin))
580 diff_tree_stdin(line);