bulk-checkin: convert index_bulk_checkin to struct object_id
[git.git] / builtin / diff-tree.c
blob473615117e0adbb301e6ddc0ab000accc513a9ee
1 #include "cache.h"
2 #include "config.h"
3 #include "diff.h"
4 #include "commit.h"
5 #include "log-tree.h"
6 #include "builtin.h"
7 #include "submodule.h"
9 static struct rev_info log_tree_opt;
11 static int diff_tree_commit_oid(const struct object_id *oid)
13 struct commit *commit = lookup_commit_reference(oid);
14 if (!commit)
15 return -1;
16 return log_tree_commit(&log_tree_opt, commit);
19 /* Diff one or more commits. */
20 static int stdin_diff_commit(struct commit *commit, const char *p)
22 struct object_id oid;
23 struct commit_list **pptr = NULL;
25 /* Graft the fake parents locally to the commit */
26 while (isspace(*p++) && !parse_oid_hex(p, &oid, &p)) {
27 struct commit *parent = lookup_commit(&oid);
28 if (!pptr) {
29 /* Free the real parent list */
30 free_commit_list(commit->parents);
31 commit->parents = NULL;
32 pptr = &(commit->parents);
34 if (parent) {
35 pptr = &commit_list_insert(parent, pptr)->next;
38 return log_tree_commit(&log_tree_opt, commit);
41 /* Diff two trees. */
42 static int stdin_diff_trees(struct tree *tree1, const char *p)
44 struct object_id oid;
45 struct tree *tree2;
46 if (!isspace(*p++) || parse_oid_hex(p, &oid, &p) || *p)
47 return error("Need exactly two trees, separated by a space");
48 tree2 = lookup_tree(&oid);
49 if (!tree2 || parse_tree(tree2))
50 return -1;
51 printf("%s %s\n", oid_to_hex(&tree1->object.oid),
52 oid_to_hex(&tree2->object.oid));
53 diff_tree_oid(&tree1->object.oid, &tree2->object.oid,
54 "", &log_tree_opt.diffopt);
55 log_tree_diff_flush(&log_tree_opt);
56 return 0;
59 static int diff_tree_stdin(char *line)
61 int len = strlen(line);
62 struct object_id oid;
63 struct object *obj;
64 const char *p;
66 if (!len || line[len-1] != '\n')
67 return -1;
68 line[len-1] = 0;
69 if (parse_oid_hex(line, &oid, &p))
70 return -1;
71 obj = parse_object(&oid);
72 if (!obj)
73 return -1;
74 if (obj->type == OBJ_COMMIT)
75 return stdin_diff_commit((struct commit *)obj, p);
76 if (obj->type == OBJ_TREE)
77 return stdin_diff_trees((struct tree *)obj, p);
78 error("Object %s is a %s, not a commit or tree",
79 oid_to_hex(&oid), type_name(obj->type));
80 return -1;
83 static const char diff_tree_usage[] =
84 "git diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
85 "[<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\n"
86 " -r diff recursively\n"
87 " --root include the initial commit as diff against /dev/null\n"
88 COMMON_DIFF_OPTIONS_HELP;
90 static void diff_tree_tweak_rev(struct rev_info *rev, struct setup_revision_opt *opt)
92 if (!rev->diffopt.output_format) {
93 if (rev->dense_combined_merges)
94 rev->diffopt.output_format = DIFF_FORMAT_PATCH;
95 else
96 rev->diffopt.output_format = DIFF_FORMAT_RAW;
100 int cmd_diff_tree(int argc, const char **argv, const char *prefix)
102 char line[1000];
103 struct object *tree1, *tree2;
104 static struct rev_info *opt = &log_tree_opt;
105 struct setup_revision_opt s_r_opt;
106 int read_stdin = 0;
108 if (argc == 2 && !strcmp(argv[1], "-h"))
109 usage(diff_tree_usage);
111 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
112 init_revisions(opt, prefix);
113 if (read_cache() < 0)
114 die(_("index file corrupt"));
115 opt->abbrev = 0;
116 opt->diff = 1;
117 opt->disable_stdin = 1;
118 memset(&s_r_opt, 0, sizeof(s_r_opt));
119 s_r_opt.tweak = diff_tree_tweak_rev;
121 precompose_argv(argc, argv);
122 argc = setup_revisions(argc, argv, opt, &s_r_opt);
124 while (--argc > 0) {
125 const char *arg = *++argv;
127 if (!strcmp(arg, "--stdin")) {
128 read_stdin = 1;
129 continue;
131 usage(diff_tree_usage);
135 * NOTE! We expect "a..b" to expand to "^a b" but it is
136 * perfectly valid for revision range parser to yield "b ^a",
137 * which means the same thing. If we get the latter, i.e. the
138 * second one is marked UNINTERESTING, we recover the original
139 * order the user gave, i.e. "a..b", by swapping the trees.
141 switch (opt->pending.nr) {
142 case 0:
143 if (!read_stdin)
144 usage(diff_tree_usage);
145 break;
146 case 1:
147 tree1 = opt->pending.objects[0].item;
148 diff_tree_commit_oid(&tree1->oid);
149 break;
150 case 2:
151 tree1 = opt->pending.objects[0].item;
152 tree2 = opt->pending.objects[1].item;
153 if (tree2->flags & UNINTERESTING) {
154 SWAP(tree2, tree1);
156 diff_tree_oid(&tree1->oid, &tree2->oid, "", &opt->diffopt);
157 log_tree_diff_flush(opt);
158 break;
161 if (read_stdin) {
162 int saved_nrl = 0;
163 int saved_dcctc = 0;
165 if (opt->diffopt.detect_rename)
166 opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
167 DIFF_SETUP_USE_CACHE);
168 while (fgets(line, sizeof(line), stdin)) {
169 struct object_id oid;
171 if (get_oid_hex(line, &oid)) {
172 fputs(line, stdout);
173 fflush(stdout);
175 else {
176 diff_tree_stdin(line);
177 if (saved_nrl < opt->diffopt.needed_rename_limit)
178 saved_nrl = opt->diffopt.needed_rename_limit;
179 if (opt->diffopt.degraded_cc_to_c)
180 saved_dcctc = 1;
183 opt->diffopt.degraded_cc_to_c = saved_dcctc;
184 opt->diffopt.needed_rename_limit = saved_nrl;
187 return diff_result_code(&opt->diffopt, 0);