Add [v]iew patch in git-am interactive.
[git/trast.git] / diff-tree.c
blob382011a2a6d1a701aeb1104991d9abbfcb5b73df
1 #include "cache.h"
2 #include "diff.h"
3 #include "commit.h"
5 static int show_root_diff = 0;
6 static int verbose_header = 0;
7 static int ignore_merges = 1;
8 static int read_stdin = 0;
10 static const char *header = NULL;
11 static const char *header_prefix = "";
12 static enum cmit_fmt commit_format = CMIT_FMT_RAW;
14 static struct diff_options diff_options;
16 static void call_diff_setup_done(void)
18 diff_setup_done(&diff_options);
21 static int call_diff_flush(void)
23 diffcore_std(&diff_options);
24 if (diff_queue_is_empty()) {
25 int saved_fmt = diff_options.output_format;
26 diff_options.output_format = DIFF_FORMAT_NO_OUTPUT;
27 diff_flush(&diff_options);
28 diff_options.output_format = saved_fmt;
29 return 0;
31 if (header) {
32 printf("%s%c", header, diff_options.line_termination);
33 header = NULL;
35 diff_flush(&diff_options);
36 return 1;
39 static int diff_tree_sha1_top(const unsigned char *old,
40 const unsigned char *new, const char *base)
42 int ret;
44 call_diff_setup_done();
45 ret = diff_tree_sha1(old, new, base, &diff_options);
46 call_diff_flush();
47 return ret;
50 static int diff_root_tree(const unsigned char *new, const char *base)
52 int retval;
53 void *tree;
54 struct tree_desc empty, real;
56 call_diff_setup_done();
57 tree = read_object_with_reference(new, "tree", &real.size, NULL);
58 if (!tree)
59 die("unable to read root tree (%s)", sha1_to_hex(new));
60 real.buf = tree;
62 empty.buf = "";
63 empty.size = 0;
64 retval = diff_tree(&empty, &real, base, &diff_options);
65 free(tree);
66 call_diff_flush();
67 return retval;
70 static const char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
72 static char this_header[16384];
73 int offset;
75 if (!verbose_header)
76 return commit;
78 offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
79 offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset);
80 return this_header;
83 static int diff_tree_commit(const unsigned char *commit, const char *name)
85 unsigned long size, offset;
86 char *buf = read_object_with_reference(commit, "commit", &size, NULL);
88 if (!buf)
89 return -1;
91 if (!name) {
92 static char commit_name[60];
93 strcpy(commit_name, sha1_to_hex(commit));
94 name = commit_name;
97 /* Root commit? */
98 if (show_root_diff && memcmp(buf + 46, "parent ", 7)) {
99 header = generate_header(name, "root", buf, size);
100 diff_root_tree(commit, "");
103 /* More than one parent? */
104 if (ignore_merges) {
105 if (!memcmp(buf + 46 + 48, "parent ", 7))
106 return 0;
109 offset = 46;
110 while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
111 unsigned char parent[20];
112 if (get_sha1_hex(buf + offset + 7, parent))
113 return -1;
114 header = generate_header(name, sha1_to_hex(parent), buf, size);
115 diff_tree_sha1_top(parent, commit, "");
116 if (!header && verbose_header) {
117 header_prefix = "\ndiff-tree ";
119 * Don't print multiple merge entries if we
120 * don't print the diffs.
123 offset += 48;
125 free(buf);
126 return 0;
129 static int diff_tree_stdin(char *line)
131 int len = strlen(line);
132 unsigned char commit[20], parent[20];
133 static char this_header[1000];
135 if (!len || line[len-1] != '\n')
136 return -1;
137 line[len-1] = 0;
138 if (get_sha1_hex(line, commit))
139 return -1;
140 if (isspace(line[40]) && !get_sha1_hex(line+41, parent)) {
141 line[40] = 0;
142 line[81] = 0;
143 sprintf(this_header, "%s (from %s)\n", line, line+41);
144 header = this_header;
145 return diff_tree_sha1_top(parent, commit, "");
147 line[40] = 0;
148 return diff_tree_commit(commit, line);
151 static const char diff_tree_usage[] =
152 "git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] "
153 "[<common diff options>] <tree-ish> <tree-ish>"
154 COMMON_DIFF_OPTIONS_HELP;
156 int main(int argc, const char **argv)
158 int nr_sha1;
159 char line[1000];
160 unsigned char sha1[2][20];
161 const char *prefix = setup_git_directory();
163 git_config(git_default_config);
164 nr_sha1 = 0;
165 diff_setup(&diff_options);
167 for (;;) {
168 int diff_opt_cnt;
169 const char *arg;
171 argv++;
172 argc--;
173 arg = *argv;
174 if (!arg)
175 break;
177 if (*arg != '-') {
178 if (nr_sha1 < 2 && !get_sha1(arg, sha1[nr_sha1])) {
179 nr_sha1++;
180 continue;
182 break;
185 diff_opt_cnt = diff_opt_parse(&diff_options, argv, argc);
186 if (diff_opt_cnt < 0)
187 usage(diff_tree_usage);
188 else if (diff_opt_cnt) {
189 argv += diff_opt_cnt - 1;
190 argc -= diff_opt_cnt - 1;
191 continue;
195 if (!strcmp(arg, "--")) {
196 argv++;
197 argc--;
198 break;
200 if (!strcmp(arg, "-r")) {
201 diff_options.recursive = 1;
202 continue;
204 if (!strcmp(arg, "-t")) {
205 diff_options.recursive = 1;
206 diff_options.tree_in_recursive = 1;
207 continue;
209 if (!strcmp(arg, "-m")) {
210 ignore_merges = 0;
211 continue;
213 if (!strcmp(arg, "-v")) {
214 verbose_header = 1;
215 header_prefix = "diff-tree ";
216 continue;
218 if (!strncmp(arg, "--pretty", 8)) {
219 verbose_header = 1;
220 header_prefix = "diff-tree ";
221 commit_format = get_commit_format(arg+8);
222 continue;
224 if (!strcmp(arg, "--stdin")) {
225 read_stdin = 1;
226 continue;
228 if (!strcmp(arg, "--root")) {
229 show_root_diff = 1;
230 continue;
232 usage(diff_tree_usage);
234 if (diff_options.output_format == DIFF_FORMAT_PATCH)
235 diff_options.recursive = 1;
237 diff_tree_setup_paths(get_pathspec(prefix, argv));
239 switch (nr_sha1) {
240 case 0:
241 if (!read_stdin)
242 usage(diff_tree_usage);
243 break;
244 case 1:
245 diff_tree_commit(sha1[0], NULL);
246 break;
247 case 2:
248 diff_tree_sha1_top(sha1[0], sha1[1], "");
249 break;
252 if (!read_stdin)
253 return 0;
255 if (diff_options.detect_rename)
256 diff_options.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
257 DIFF_SETUP_USE_CACHE);
258 while (fgets(line, sizeof(line), stdin))
259 diff_tree_stdin(line);
261 return 0;