Merge branch 'ff/c99'
[git] / builtin-diff-tree.c
1 #include "cache.h"
2 #include "diff.h"
3 #include "commit.h"
4 #include "log-tree.h"
5 #include "builtin.h"
6
7 static struct rev_info log_tree_opt;
8
9 static int diff_tree_commit_sha1(const unsigned char *sha1)
10 {
11         struct commit *commit = lookup_commit_reference(sha1);
12         if (!commit)
13                 return -1;
14         return log_tree_commit(&log_tree_opt, commit);
15 }
16
17 static int diff_tree_stdin(char *line)
18 {
19         int len = strlen(line);
20         unsigned char sha1[20];
21         struct commit *commit;
22
23         if (!len || line[len-1] != '\n')
24                 return -1;
25         line[len-1] = 0;
26         if (get_sha1_hex(line, sha1))
27                 return -1;
28         commit = lookup_commit(sha1);
29         if (!commit || parse_commit(commit))
30                 return -1;
31         if (isspace(line[40]) && !get_sha1_hex(line+41, sha1)) {
32                 /* Graft the fake parents locally to the commit */
33                 int pos = 41;
34                 struct commit_list **pptr, *parents;
35
36                 /* Free the real parent list */
37                 for (parents = commit->parents; parents; ) {
38                         struct commit_list *tmp = parents->next;
39                         free(parents);
40                         parents = tmp;
41                 }
42                 commit->parents = NULL;
43                 pptr = &(commit->parents);
44                 while (line[pos] && !get_sha1_hex(line + pos, sha1)) {
45                         struct commit *parent = lookup_commit(sha1);
46                         if (parent) {
47                                 pptr = &commit_list_insert(parent, pptr)->next;
48                         }
49                         pos += 41;
50                 }
51         }
52         return log_tree_commit(&log_tree_opt, commit);
53 }
54
55 static const char diff_tree_usage[] =
56 "git-diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
57 "[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n"
58 "  -r            diff recursively\n"
59 "  --root        include the initial commit as diff against /dev/null\n"
60 COMMON_DIFF_OPTIONS_HELP;
61
62 int cmd_diff_tree(int argc, const char **argv, char **envp)
63 {
64         int nr_sha1;
65         char line[1000];
66         struct object *tree1, *tree2;
67         static struct rev_info *opt = &log_tree_opt;
68         int read_stdin = 0;
69
70         git_config(git_diff_config);
71         nr_sha1 = 0;
72         init_revisions(opt);
73         opt->abbrev = 0;
74         opt->diff = 1;
75         argc = setup_revisions(argc, argv, opt, NULL);
76
77         while (--argc > 0) {
78                 const char *arg = *++argv;
79
80                 if (!strcmp(arg, "--stdin")) {
81                         read_stdin = 1;
82                         continue;
83                 }
84                 usage(diff_tree_usage);
85         }
86
87         /*
88          * NOTE! We expect "a ^b" to be equal to "a..b", so we
89          * reverse the order of the objects if the second one
90          * is marked UNINTERESTING.
91          */
92         nr_sha1 = opt->pending.nr;
93         switch (nr_sha1) {
94         case 0:
95                 if (!read_stdin)
96                         usage(diff_tree_usage);
97                 break;
98         case 1:
99                 tree1 = opt->pending.objects[0].item;
100                 diff_tree_commit_sha1(tree1->sha1);
101                 break;
102         case 2:
103                 tree1 = opt->pending.objects[0].item;
104                 tree2 = opt->pending.objects[1].item;
105                 if (tree2->flags & UNINTERESTING) {
106                         struct object *tmp = tree2;
107                         tree2 = tree1;
108                         tree1 = tmp;
109                 }
110                 diff_tree_sha1(tree1->sha1,
111                                tree2->sha1,
112                                "", &opt->diffopt);
113                 log_tree_diff_flush(opt);
114                 break;
115         }
116
117         if (!read_stdin)
118                 return 0;
119
120         if (opt->diffopt.detect_rename)
121                 opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
122                                        DIFF_SETUP_USE_CACHE);
123         while (fgets(line, sizeof(line), stdin)) {
124                 unsigned char sha1[20];
125
126                 if (get_sha1_hex(line, sha1)) {
127                         fputs(line, stdout);
128                         fflush(stdout);
129                 }
130                 else
131                         diff_tree_stdin(line);
132         }
133         return 0;
134 }