pickaxe: assert that we must have a needle under -G or -S
[git/debian.git] / builtin / diff-tree.c
blobf33d30d57bff2ef8923ea9649a5afd4d49eb0574
1 #define USE_THE_INDEX_COMPATIBILITY_MACROS
2 #include "cache.h"
3 #include "config.h"
4 #include "diff.h"
5 #include "commit.h"
6 #include "log-tree.h"
7 #include "builtin.h"
8 #include "submodule.h"
9 #include "repository.h"
11 static struct rev_info log_tree_opt;
13 static int diff_tree_commit_oid(const struct object_id *oid)
15 struct commit *commit = lookup_commit_reference(the_repository, oid);
16 if (!commit)
17 return -1;
18 return log_tree_commit(&log_tree_opt, commit);
21 /* Diff one or more commits. */
22 static int stdin_diff_commit(struct commit *commit, const char *p)
24 struct object_id oid;
25 struct commit_list **pptr = NULL;
27 /* Graft the fake parents locally to the commit */
28 while (isspace(*p++) && !parse_oid_hex(p, &oid, &p)) {
29 struct commit *parent = lookup_commit(the_repository, &oid);
30 if (!pptr) {
31 /* Free the real parent list */
32 free_commit_list(commit->parents);
33 commit->parents = NULL;
34 pptr = &(commit->parents);
36 if (parent) {
37 pptr = &commit_list_insert(parent, pptr)->next;
40 return log_tree_commit(&log_tree_opt, commit);
43 /* Diff two trees. */
44 static int stdin_diff_trees(struct tree *tree1, const char *p)
46 struct object_id oid;
47 struct tree *tree2;
48 if (!isspace(*p++) || parse_oid_hex(p, &oid, &p) || *p)
49 return error("Need exactly two trees, separated by a space");
50 tree2 = lookup_tree(the_repository, &oid);
51 if (!tree2 || parse_tree(tree2))
52 return -1;
53 printf("%s %s\n", oid_to_hex(&tree1->object.oid),
54 oid_to_hex(&tree2->object.oid));
55 diff_tree_oid(&tree1->object.oid, &tree2->object.oid,
56 "", &log_tree_opt.diffopt);
57 log_tree_diff_flush(&log_tree_opt);
58 return 0;
61 static int diff_tree_stdin(char *line)
63 int len = strlen(line);
64 struct object_id oid;
65 struct object *obj;
66 const char *p;
68 if (!len || line[len-1] != '\n')
69 return -1;
70 line[len-1] = 0;
71 if (parse_oid_hex(line, &oid, &p))
72 return -1;
73 obj = parse_object(the_repository, &oid);
74 if (!obj)
75 return -1;
76 if (obj->type == OBJ_COMMIT)
77 return stdin_diff_commit((struct commit *)obj, p);
78 if (obj->type == OBJ_TREE)
79 return stdin_diff_trees((struct tree *)obj, p);
80 error("Object %s is a %s, not a commit or tree",
81 oid_to_hex(&oid), type_name(obj->type));
82 return -1;
85 static const char diff_tree_usage[] =
86 "git diff-tree [--stdin] [-m] [-c | --cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
87 "[<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\n"
88 " -r diff recursively\n"
89 " -c show combined diff for merge commits\n"
90 " --cc show combined diff for merge commits removing uninteresting hunks\n"
91 " --combined-all-paths\n"
92 " show name of file in all parents for combined diffs\n"
93 " --root include the initial commit as diff against /dev/null\n"
94 COMMON_DIFF_OPTIONS_HELP;
96 static void diff_tree_tweak_rev(struct rev_info *rev, struct setup_revision_opt *opt)
98 if (!rev->diffopt.output_format) {
99 if (rev->dense_combined_merges)
100 rev->diffopt.output_format = DIFF_FORMAT_PATCH;
101 else
102 rev->diffopt.output_format = DIFF_FORMAT_RAW;
106 int cmd_diff_tree(int argc, const char **argv, const char *prefix)
108 char line[1000];
109 struct object *tree1, *tree2;
110 static struct rev_info *opt = &log_tree_opt;
111 struct setup_revision_opt s_r_opt;
112 struct userformat_want w;
113 int read_stdin = 0;
114 int merge_base = 0;
116 if (argc == 2 && !strcmp(argv[1], "-h"))
117 usage(diff_tree_usage);
119 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
120 repo_init_revisions(the_repository, opt, prefix);
121 if (read_cache() < 0)
122 die(_("index file corrupt"));
123 opt->abbrev = 0;
124 opt->diff = 1;
125 opt->disable_stdin = 1;
126 memset(&s_r_opt, 0, sizeof(s_r_opt));
127 s_r_opt.tweak = diff_tree_tweak_rev;
129 prefix = precompose_argv_prefix(argc, argv, prefix);
130 argc = setup_revisions(argc, argv, opt, &s_r_opt);
132 memset(&w, 0, sizeof(w));
133 userformat_find_requirements(NULL, &w);
135 if (!opt->show_notes_given && w.notes)
136 opt->show_notes = 1;
137 if (opt->show_notes)
138 load_display_notes(&opt->notes_opt);
140 while (--argc > 0) {
141 const char *arg = *++argv;
143 if (!strcmp(arg, "--stdin")) {
144 read_stdin = 1;
145 continue;
147 if (!strcmp(arg, "--merge-base")) {
148 merge_base = 1;
149 continue;
151 usage(diff_tree_usage);
154 if (read_stdin && merge_base)
155 die(_("--stdin and --merge-base are mutually exclusive"));
156 if (merge_base && opt->pending.nr != 2)
157 die(_("--merge-base only works with two commits"));
159 opt->diffopt.rotate_to_strict = 1;
162 * NOTE! We expect "a..b" to expand to "^a b" but it is
163 * perfectly valid for revision range parser to yield "b ^a",
164 * which means the same thing. If we get the latter, i.e. the
165 * second one is marked UNINTERESTING, we recover the original
166 * order the user gave, i.e. "a..b", by swapping the trees.
168 switch (opt->pending.nr) {
169 case 0:
170 if (!read_stdin)
171 usage(diff_tree_usage);
172 break;
173 case 1:
174 tree1 = opt->pending.objects[0].item;
175 diff_tree_commit_oid(&tree1->oid);
176 break;
177 case 2:
178 tree1 = opt->pending.objects[0].item;
179 tree2 = opt->pending.objects[1].item;
180 if (merge_base) {
181 struct object_id oid;
183 diff_get_merge_base(opt, &oid);
184 tree1 = lookup_object(the_repository, &oid);
185 } else if (tree2->flags & UNINTERESTING) {
186 SWAP(tree2, tree1);
188 diff_tree_oid(&tree1->oid, &tree2->oid, "", &opt->diffopt);
189 log_tree_diff_flush(opt);
190 break;
193 if (read_stdin) {
194 int saved_nrl = 0;
195 int saved_dcctc = 0;
197 opt->diffopt.rotate_to_strict = 0;
198 if (opt->diffopt.detect_rename) {
199 if (!the_index.cache)
200 repo_read_index(the_repository);
201 opt->diffopt.setup |= DIFF_SETUP_USE_SIZE_CACHE;
203 while (fgets(line, sizeof(line), stdin)) {
204 struct object_id oid;
206 if (get_oid_hex(line, &oid)) {
207 fputs(line, stdout);
208 fflush(stdout);
210 else {
211 diff_tree_stdin(line);
212 if (saved_nrl < opt->diffopt.needed_rename_limit)
213 saved_nrl = opt->diffopt.needed_rename_limit;
214 if (opt->diffopt.degraded_cc_to_c)
215 saved_dcctc = 1;
218 opt->diffopt.degraded_cc_to_c = saved_dcctc;
219 opt->diffopt.needed_rename_limit = saved_nrl;
222 return diff_result_code(&opt->diffopt, 0);