2 * Helper functions for tree diff generation
8 static char *malloc_base(const char *base, int baselen, const char *path, int pathlen)
10 char *newbase = xmalloc(baselen + pathlen + 2);
11 memcpy(newbase, base, baselen);
12 memcpy(newbase + baselen, path, pathlen);
13 memcpy(newbase + baselen + pathlen, "/", 2);
17 static void show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc,
18 const char *base, int baselen);
20 static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const char *base, int baselen, struct diff_options *opt)
22 unsigned mode1, mode2;
23 const char *path1, *path2;
24 const unsigned char *sha1, *sha2;
25 int cmp, pathlen1, pathlen2;
27 sha1 = tree_entry_extract(t1, &path1, &mode1);
28 sha2 = tree_entry_extract(t2, &path2, &mode2);
30 pathlen1 = tree_entry_len(path1, sha1);
31 pathlen2 = tree_entry_len(path2, sha2);
32 cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2);
34 show_entry(opt, "-", t1, base, baselen);
38 show_entry(opt, "+", t2, base, baselen);
41 if (!opt->find_copies_harder && !hashcmp(sha1, sha2) && mode1 == mode2)
45 * If the filemode has changed to/from a directory from/to a regular
46 * file, we need to consider it a remove and an add.
48 if (S_ISDIR(mode1) != S_ISDIR(mode2)) {
49 show_entry(opt, "-", t1, base, baselen);
50 show_entry(opt, "+", t2, base, baselen);
54 if (opt->recursive && S_ISDIR(mode1)) {
56 char *newbase = malloc_base(base, baselen, path1, pathlen1);
57 if (opt->tree_in_recursive)
58 opt->change(opt, mode1, mode2,
59 sha1, sha2, base, path1);
60 retval = diff_tree_sha1(sha1, sha2, newbase, opt);
65 opt->change(opt, mode1, mode2, sha1, sha2, base, path1);
70 * Is a tree entry interesting given the pathspec we have?
75 * - negative for "no, and no subsequent entries will be either"
77 static int tree_entry_interesting(struct tree_desc *desc, const char *base, int baselen, struct diff_options *opt)
80 const unsigned char *sha1;
88 sha1 = tree_entry_extract(desc, &path, &mode);
90 pathlen = tree_entry_len(path, sha1);
92 for (i=0; i < opt->nr_paths; i++) {
93 const char *match = opt->paths[i];
94 int matchlen = opt->pathlens[i];
96 if (baselen >= matchlen) {
97 /* If it doesn't match, move along... */
98 if (strncmp(base, match, matchlen))
101 /* The base is a subdirectory of a path which was specified. */
105 /* Does the base match? */
106 if (strncmp(base, match, baselen))
112 if (pathlen > matchlen)
115 if (matchlen > pathlen) {
116 if (match[pathlen] != '/')
122 if (strncmp(path, match, pathlen))
127 return 0; /* No matches */
130 /* A whole sub-tree went away or appeared */
131 static void show_tree(struct diff_options *opt, const char *prefix, struct tree_desc *desc, const char *base, int baselen)
134 int show = tree_entry_interesting(desc, base, baselen, opt);
138 show_entry(opt, prefix, desc, base, baselen);
139 update_tree_entry(desc);
143 /* A file entry went away or appeared */
144 static void show_entry(struct diff_options *opt, const char *prefix, struct tree_desc *desc,
145 const char *base, int baselen)
149 const unsigned char *sha1 = tree_entry_extract(desc, &path, &mode);
151 if (opt->recursive && S_ISDIR(mode)) {
152 enum object_type type;
153 int pathlen = tree_entry_len(path, sha1);
154 char *newbase = malloc_base(base, baselen, path, pathlen);
155 struct tree_desc inner;
158 tree = read_sha1_file(sha1, &type, &inner.size);
159 if (!tree || type != OBJ_TREE)
160 die("corrupt tree sha %s", sha1_to_hex(sha1));
163 show_tree(opt, prefix, &inner, newbase, baselen + 1 + pathlen);
168 opt->add_remove(opt, prefix[0], mode, sha1, base, path);
172 static void skip_uninteresting(struct tree_desc *t, const char *base, int baselen, struct diff_options *opt)
175 int show = tree_entry_interesting(t, base, baselen, opt);
177 update_tree_entry(t);
187 int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt)
189 int baselen = strlen(base);
192 if (opt->quiet && opt->has_changes)
195 skip_uninteresting(t1, base, baselen, opt);
196 skip_uninteresting(t2, base, baselen, opt);
201 show_entry(opt, "+", t2, base, baselen);
202 update_tree_entry(t2);
206 show_entry(opt, "-", t1, base, baselen);
207 update_tree_entry(t1);
210 switch (compare_tree_entry(t1, t2, base, baselen, opt)) {
212 update_tree_entry(t1);
215 update_tree_entry(t1);
218 update_tree_entry(t2);
221 die("git-diff-tree: internal error");
226 int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base, struct diff_options *opt)
229 struct tree_desc t1, t2;
232 tree1 = read_object_with_reference(old, tree_type, &t1.size, NULL);
234 die("unable to read source tree (%s)", sha1_to_hex(old));
235 tree2 = read_object_with_reference(new, tree_type, &t2.size, NULL);
237 die("unable to read destination tree (%s)", sha1_to_hex(new));
240 retval = diff_tree(&t1, &t2, base, opt);
246 int diff_root_tree_sha1(const unsigned char *new, const char *base, struct diff_options *opt)
250 struct tree_desc empty, real;
252 tree = read_object_with_reference(new, tree_type, &real.size, NULL);
254 die("unable to read root tree (%s)", sha1_to_hex(new));
259 retval = diff_tree(&empty, &real, base, opt);
264 static int count_paths(const char **paths)
272 void diff_tree_release_paths(struct diff_options *opt)
277 void diff_tree_setup_paths(const char **p, struct diff_options *opt)
280 opt->pathlens = NULL;
287 opt->nr_paths = count_paths(p);
288 if (opt->nr_paths == 0) {
289 opt->pathlens = NULL;
292 opt->pathlens = xmalloc(opt->nr_paths * sizeof(int));
293 for (i=0; i < opt->nr_paths; i++)
294 opt->pathlens[i] = strlen(p[i]);