freshlybakedca.ke
Git fork
1#define USE_THE_REPOSITORY_VARIABLE
2
3#include "builtin.h"
4#include "config.h"
5#include "diff.h"
6#include "commit.h"
7#include "gettext.h"
8#include "hex.h"
9#include "log-tree.h"
10#include "read-cache-ll.h"
11#include "revision.h"
12#include "tmp-objdir.h"
13#include "tree.h"
14
15static struct rev_info log_tree_opt;
16
17static int diff_tree_commit_oid(const struct object_id *oid)
18{
19 struct commit *commit = lookup_commit_reference(the_repository, oid);
20 if (!commit)
21 return -1;
22 return log_tree_commit(&log_tree_opt, commit);
23}
24
25/* Diff one or more commits. */
26static int stdin_diff_commit(struct commit *commit, const char *p)
27{
28 struct object_id oid;
29 struct commit_list **pptr = NULL;
30
31 /* Graft the fake parents locally to the commit */
32 while (isspace(*p++) && !parse_oid_hex(p, &oid, &p)) {
33 struct commit *parent = lookup_commit(the_repository, &oid);
34 if (!pptr) {
35 /* Free the real parent list */
36 free_commit_list(commit->parents);
37 commit->parents = NULL;
38 pptr = &(commit->parents);
39 }
40 if (parent) {
41 pptr = &commit_list_insert(parent, pptr)->next;
42 }
43 }
44 return log_tree_commit(&log_tree_opt, commit);
45}
46
47/* Diff two trees. */
48static int stdin_diff_trees(struct tree *tree1, const char *p)
49{
50 struct object_id oid;
51 struct tree *tree2;
52 if (!isspace(*p++) || parse_oid_hex(p, &oid, &p) || *p)
53 return error("Need exactly two trees, separated by a space");
54 tree2 = lookup_tree(the_repository, &oid);
55 if (!tree2 || parse_tree(tree2))
56 return -1;
57 printf("%s %s\n", oid_to_hex(&tree1->object.oid),
58 oid_to_hex(&tree2->object.oid));
59 diff_tree_oid(&tree1->object.oid, &tree2->object.oid,
60 "", &log_tree_opt.diffopt);
61 log_tree_diff_flush(&log_tree_opt);
62 return 0;
63}
64
65static int diff_tree_stdin(char *line)
66{
67 int len = strlen(line);
68 struct object_id oid;
69 struct object *obj;
70 const char *p;
71
72 if (!len || line[len-1] != '\n')
73 return -1;
74 line[len-1] = 0;
75 if (parse_oid_hex(line, &oid, &p))
76 return -1;
77 obj = parse_object(the_repository, &oid);
78 if (!obj)
79 return -1;
80 if (obj->type == OBJ_COMMIT)
81 return stdin_diff_commit((struct commit *)obj, p);
82 if (obj->type == OBJ_TREE)
83 return stdin_diff_trees((struct tree *)obj, p);
84 error("Object %s is a %s, not a commit or tree",
85 oid_to_hex(&oid), type_name(obj->type));
86 return -1;
87}
88
89static const char diff_tree_usage[] =
90"git diff-tree [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
91" [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n"
92" [<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\n"
93"\n"
94" -r diff recursively\n"
95" -c show combined diff for merge commits\n"
96" --cc show combined diff for merge commits removing uninteresting hunks\n"
97" --combined-all-paths\n"
98" show name of file in all parents for combined diffs\n"
99" --root include the initial commit as diff against /dev/null\n"
100COMMON_DIFF_OPTIONS_HELP;
101
102static void diff_tree_tweak_rev(struct rev_info *rev)
103{
104 if (!rev->diffopt.output_format) {
105 if (rev->dense_combined_merges)
106 rev->diffopt.output_format = DIFF_FORMAT_PATCH;
107 else
108 rev->diffopt.output_format = DIFF_FORMAT_RAW;
109 }
110}
111
112int cmd_diff_tree(int argc,
113 const char **argv,
114 const char *prefix,
115 struct repository *repo UNUSED)
116{
117 char line[1000];
118 struct object *tree1, *tree2;
119 static struct rev_info *opt = &log_tree_opt;
120 struct setup_revision_opt s_r_opt;
121 struct userformat_want w;
122 int read_stdin = 0;
123 int merge_base = 0;
124
125 show_usage_if_asked(argc, argv, diff_tree_usage);
126
127 repo_config(the_repository, git_diff_basic_config, NULL); /* no "diff" UI options */
128
129 prepare_repo_settings(the_repository);
130 the_repository->settings.command_requires_full_index = 0;
131
132 repo_init_revisions(the_repository, opt, prefix);
133 if (repo_read_index(the_repository) < 0)
134 die(_("index file corrupt"));
135 opt->abbrev = 0;
136 opt->diff = 1;
137 opt->disable_stdin = 1;
138 memset(&s_r_opt, 0, sizeof(s_r_opt));
139 s_r_opt.tweak = diff_tree_tweak_rev;
140
141 prefix = precompose_argv_prefix(argc, argv, prefix);
142 argc = setup_revisions(argc, argv, opt, &s_r_opt);
143
144 memset(&w, 0, sizeof(w));
145 userformat_find_requirements(NULL, &w);
146
147 if (!opt->show_notes_given && w.notes)
148 opt->show_notes = 1;
149 if (opt->show_notes)
150 load_display_notes(&opt->notes_opt);
151
152 while (--argc > 0) {
153 const char *arg = *++argv;
154
155 if (!strcmp(arg, "--stdin")) {
156 read_stdin = 1;
157 continue;
158 }
159 if (!strcmp(arg, "--merge-base")) {
160 merge_base = 1;
161 continue;
162 }
163 usage(diff_tree_usage);
164 }
165
166 if (read_stdin && merge_base)
167 die(_("options '%s' and '%s' cannot be used together"), "--stdin", "--merge-base");
168 if (merge_base && opt->pending.nr != 2)
169 die(_("--merge-base only works with two commits"));
170
171 opt->diffopt.rotate_to_strict = 1;
172
173 /*
174 * NOTE! We expect "a..b" to expand to "^a b" but it is
175 * perfectly valid for revision range parser to yield "b ^a",
176 * which means the same thing. If we get the latter, i.e. the
177 * second one is marked UNINTERESTING, we recover the original
178 * order the user gave, i.e. "a..b", by swapping the trees.
179 */
180 switch (opt->pending.nr) {
181 case 0:
182 if (!read_stdin)
183 usage(diff_tree_usage);
184 break;
185 case 1:
186 tree1 = opt->pending.objects[0].item;
187 diff_tree_commit_oid(&tree1->oid);
188 break;
189 case 2:
190 tree1 = opt->pending.objects[0].item;
191 tree2 = opt->pending.objects[1].item;
192 if (merge_base) {
193 struct object_id oid;
194
195 diff_get_merge_base(opt, &oid);
196 tree1 = lookup_object(the_repository, &oid);
197 } else if (tree2->flags & UNINTERESTING) {
198 SWAP(tree2, tree1);
199 }
200 diff_tree_oid(&tree1->oid, &tree2->oid, "", &opt->diffopt);
201 log_tree_diff_flush(opt);
202 break;
203 }
204
205 if (read_stdin) {
206 int saved_nrl = 0;
207 int saved_dcctc = 0;
208
209 opt->diffopt.rotate_to_strict = 0;
210 opt->diffopt.no_free = 1;
211 if (opt->diffopt.detect_rename) {
212 if (the_repository->index->cache)
213 repo_read_index(the_repository);
214 opt->diffopt.setup |= DIFF_SETUP_USE_SIZE_CACHE;
215 }
216 while (fgets(line, sizeof(line), stdin)) {
217 struct object_id oid;
218
219 if (get_oid_hex(line, &oid)) {
220 fputs(line, stdout);
221 fflush(stdout);
222 }
223 else {
224 diff_tree_stdin(line);
225 if (saved_nrl < opt->diffopt.needed_rename_limit)
226 saved_nrl = opt->diffopt.needed_rename_limit;
227 if (opt->diffopt.degraded_cc_to_c)
228 saved_dcctc = 1;
229 }
230 }
231 opt->diffopt.degraded_cc_to_c = saved_dcctc;
232 opt->diffopt.needed_rename_limit = saved_nrl;
233 opt->diffopt.no_free = 0;
234 diff_free(&opt->diffopt);
235 }
236
237 return diff_result_code(opt);
238}