]>
Commit | Line | Data |
---|---|---|
f8adbec9 | 1 | #define USE_THE_INDEX_COMPATIBILITY_MACROS |
9174026c | 2 | #include "cache.h" |
b2141fc1 | 3 | #include "config.h" |
3ebfd4aa | 4 | #include "diff.h" |
e3bc7a3b | 5 | #include "commit.h" |
5f1c3f07 | 6 | #include "log-tree.h" |
e8cc9cd9 | 7 | #include "builtin.h" |
302ad7a9 | 8 | #include "submodule.h" |
109cd76d | 9 | #include "repository.h" |
9174026c | 10 | |
cd2bdc53 | 11 | static struct rev_info log_tree_opt; |
b11645be | 12 | |
315f49f2 | 13 | static int diff_tree_commit_oid(const struct object_id *oid) |
45392a64 | 14 | { |
2122f675 | 15 | struct commit *commit = lookup_commit_reference(the_repository, oid); |
45392a64 JH |
16 | if (!commit) |
17 | return -1; | |
5f1c3f07 | 18 | return log_tree_commit(&log_tree_opt, commit); |
45392a64 JH |
19 | } |
20 | ||
a57114c8 | 21 | /* Diff one or more commits. */ |
5f5e936d | 22 | static int stdin_diff_commit(struct commit *commit, const char *p) |
b11645be | 23 | { |
5f5e936d | 24 | struct object_id oid; |
25 | struct commit_list **pptr = NULL; | |
26 | ||
27 | /* Graft the fake parents locally to the commit */ | |
28 | while (isspace(*p++) && !parse_oid_hex(p, &oid, &p)) { | |
c1f5eb49 | 29 | struct commit *parent = lookup_commit(the_repository, &oid); |
5f5e936d | 30 | if (!pptr) { |
31 | /* Free the real parent list */ | |
32 | free_commit_list(commit->parents); | |
33 | commit->parents = NULL; | |
34 | pptr = &(commit->parents); | |
35 | } | |
36 | if (parent) { | |
37 | pptr = &commit_list_insert(parent, pptr)->next; | |
45392a64 | 38 | } |
b11645be | 39 | } |
5f1c3f07 | 40 | return log_tree_commit(&log_tree_opt, commit); |
e0965d83 LT |
41 | } |
42 | ||
140b378d | 43 | /* Diff two trees. */ |
5f5e936d | 44 | static int stdin_diff_trees(struct tree *tree1, const char *p) |
140b378d | 45 | { |
5f5e936d | 46 | struct object_id oid; |
140b378d | 47 | struct tree *tree2; |
5f5e936d | 48 | if (!isspace(*p++) || parse_oid_hex(p, &oid, &p) || *p) |
140b378d | 49 | return error("Need exactly two trees, separated by a space"); |
f86bcc7b | 50 | tree2 = lookup_tree(the_repository, &oid); |
140b378d KW |
51 | if (!tree2 || parse_tree(tree2)) |
52 | return -1; | |
f2fd0760 | 53 | printf("%s %s\n", oid_to_hex(&tree1->object.oid), |
54 | oid_to_hex(&tree2->object.oid)); | |
66f414f8 BW |
55 | diff_tree_oid(&tree1->object.oid, &tree2->object.oid, |
56 | "", &log_tree_opt.diffopt); | |
140b378d KW |
57 | log_tree_diff_flush(&log_tree_opt); |
58 | return 0; | |
59 | } | |
60 | ||
a57114c8 KW |
61 | static int diff_tree_stdin(char *line) |
62 | { | |
63 | int len = strlen(line); | |
5f5e936d | 64 | struct object_id oid; |
140b378d | 65 | struct object *obj; |
5f5e936d | 66 | const char *p; |
a57114c8 KW |
67 | |
68 | if (!len || line[len-1] != '\n') | |
69 | return -1; | |
70 | line[len-1] = 0; | |
5f5e936d | 71 | if (parse_oid_hex(line, &oid, &p)) |
a57114c8 | 72 | return -1; |
109cd76d | 73 | obj = parse_object(the_repository, &oid); |
140b378d | 74 | if (!obj) |
a57114c8 | 75 | return -1; |
140b378d | 76 | if (obj->type == OBJ_COMMIT) |
5f5e936d | 77 | return stdin_diff_commit((struct commit *)obj, p); |
140b378d | 78 | if (obj->type == OBJ_TREE) |
5f5e936d | 79 | return stdin_diff_trees((struct tree *)obj, p); |
140b378d | 80 | error("Object %s is a %s, not a commit or tree", |
debca9d2 | 81 | oid_to_hex(&oid), type_name(obj->type)); |
140b378d | 82 | return -1; |
a57114c8 KW |
83 | } |
84 | ||
4d1f1190 | 85 | static const char diff_tree_usage[] = |
d76ce4f7 | 86 | "git diff-tree [--stdin] [-m] [-c | --cc] [-s] [-v] [--pretty] [-t] [-r] [--root] " |
9c9b4f2f | 87 | "[<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\n" |
50b8e355 | 88 | " -r diff recursively\n" |
d76ce4f7 EN |
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" | |
50b8e355 | 93 | " --root include the initial commit as diff against /dev/null\n" |
dda2d79a | 94 | COMMON_DIFF_OPTIONS_HELP; |
a8db165e | 95 | |
b4490059 JH |
96 | static void diff_tree_tweak_rev(struct rev_info *rev, struct setup_revision_opt *opt) |
97 | { | |
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; | |
103 | } | |
104 | } | |
105 | ||
a633fca0 | 106 | int cmd_diff_tree(int argc, const char **argv, const char *prefix) |
73134b6d | 107 | { |
e0965d83 | 108 | char line[1000]; |
cd2bdc53 LT |
109 | struct object *tree1, *tree2; |
110 | static struct rev_info *opt = &log_tree_opt; | |
b4490059 | 111 | struct setup_revision_opt s_r_opt; |
5778b22b | 112 | struct userformat_want w; |
5f1c3f07 | 113 | int read_stdin = 0; |
73134b6d | 114 | |
5a88f97c JH |
115 | if (argc == 2 && !strcmp(argv[1], "-h")) |
116 | usage(diff_tree_usage); | |
117 | ||
37590ce3 | 118 | git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ |
2abf3503 | 119 | repo_init_revisions(the_repository, opt, prefix); |
fd66bcc3 BW |
120 | if (read_cache() < 0) |
121 | die(_("index file corrupt")); | |
8e8f9987 | 122 | opt->abbrev = 0; |
91539833 | 123 | opt->diff = 1; |
8b3dce56 | 124 | opt->disable_stdin = 1; |
b4490059 JH |
125 | memset(&s_r_opt, 0, sizeof(s_r_opt)); |
126 | s_r_opt.tweak = diff_tree_tweak_rev; | |
90a78b83 AR |
127 | |
128 | precompose_argv(argc, argv); | |
b4490059 | 129 | argc = setup_revisions(argc, argv, opt, &s_r_opt); |
6b5ee137 | 130 | |
5778b22b TB |
131 | memset(&w, 0, sizeof(w)); |
132 | userformat_find_requirements(NULL, &w); | |
133 | ||
134 | if (!opt->show_notes_given && w.notes) | |
135 | opt->show_notes = 1; | |
136 | if (opt->show_notes) | |
137 | load_display_notes(&opt->notes_opt); | |
138 | ||
cd2bdc53 LT |
139 | while (--argc > 0) { |
140 | const char *arg = *++argv; | |
c5b42386 | 141 | |
e0965d83 LT |
142 | if (!strcmp(arg, "--stdin")) { |
143 | read_stdin = 1; | |
144 | continue; | |
145 | } | |
c5bac17a | 146 | usage(diff_tree_usage); |
73134b6d LT |
147 | } |
148 | ||
cd2bdc53 | 149 | /* |
8ba74bfd JH |
150 | * NOTE! We expect "a..b" to expand to "^a b" but it is |
151 | * perfectly valid for revision range parser to yield "b ^a", | |
152 | * which means the same thing. If we get the latter, i.e. the | |
153 | * second one is marked UNINTERESTING, we recover the original | |
154 | * order the user gave, i.e. "a..b", by swapping the trees. | |
cd2bdc53 | 155 | */ |
315f49f2 | 156 | switch (opt->pending.nr) { |
0a8365a1 LT |
157 | case 0: |
158 | if (!read_stdin) | |
159 | usage(diff_tree_usage); | |
160 | break; | |
161 | case 1: | |
1f1e895f | 162 | tree1 = opt->pending.objects[0].item; |
315f49f2 | 163 | diff_tree_commit_oid(&tree1->oid); |
0a8365a1 LT |
164 | break; |
165 | case 2: | |
1f1e895f LT |
166 | tree1 = opt->pending.objects[0].item; |
167 | tree2 = opt->pending.objects[1].item; | |
168 | if (tree2->flags & UNINTERESTING) { | |
35d803bc | 169 | SWAP(tree2, tree1); |
1f1e895f | 170 | } |
66f414f8 | 171 | diff_tree_oid(&tree1->oid, &tree2->oid, "", &opt->diffopt); |
5f1c3f07 | 172 | log_tree_diff_flush(opt); |
0a8365a1 LT |
173 | break; |
174 | } | |
175 | ||
62c64895 | 176 | if (read_stdin) { |
f31027c9 JH |
177 | int saved_nrl = 0; |
178 | int saved_dcctc = 0; | |
179 | ||
ff7fe37b NTND |
180 | if (opt->diffopt.detect_rename) { |
181 | if (!the_index.cache) | |
e1ff0a32 | 182 | repo_read_index(the_repository); |
ff7fe37b NTND |
183 | opt->diffopt.setup |= DIFF_SETUP_USE_SIZE_CACHE; |
184 | } | |
62c64895 | 185 | while (fgets(line, sizeof(line), stdin)) { |
5f5e936d | 186 | struct object_id oid; |
e0965d83 | 187 | |
5f5e936d | 188 | if (get_oid_hex(line, &oid)) { |
62c64895 WC |
189 | fputs(line, stdout); |
190 | fflush(stdout); | |
191 | } | |
f31027c9 | 192 | else { |
62c64895 | 193 | diff_tree_stdin(line); |
f31027c9 JH |
194 | if (saved_nrl < opt->diffopt.needed_rename_limit) |
195 | saved_nrl = opt->diffopt.needed_rename_limit; | |
196 | if (opt->diffopt.degraded_cc_to_c) | |
197 | saved_dcctc = 1; | |
198 | } | |
e0c97ca6 | 199 | } |
f31027c9 JH |
200 | opt->diffopt.degraded_cc_to_c = saved_dcctc; |
201 | opt->diffopt.needed_rename_limit = saved_nrl; | |
e0c97ca6 | 202 | } |
da31b358 JH |
203 | |
204 | return diff_result_code(&opt->diffopt, 0); | |
9174026c | 205 | } |