[PATCH] Diffcore updates.
[git/git.git] / diff-tree.c
1 #include <ctype.h>
2 #include "cache.h"
3 #include "diff.h"
4
5 static int silent = 0;
6 static int show_root_diff = 0;
7 static int verbose_header = 0;
8 static int ignore_merges = 1;
9 static int recursive = 0;
10 static int read_stdin = 0;
11 static int diff_output_format = DIFF_FORMAT_HUMAN;
12 static int detect_rename = 0;
13 static int reverse_diff = 0;
14 static int diff_score_opt = 0;
15 static const char *pickaxe = NULL;
16 static const char *header = NULL;
17 static const char *header_prefix = "";
18
19 // What paths are we interested in?
20 static int nr_paths = 0;
21 static const char **paths = NULL;
22 static int *pathlens = NULL;
23
24 static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base);
25
26 static void update_tree_entry(void **bufp, unsigned long *sizep)
27 {
28 void *buf = *bufp;
29 unsigned long size = *sizep;
30 int len = strlen(buf) + 1 + 20;
31
32 if (size < len)
33 die("corrupt tree file");
34 *bufp = buf + len;
35 *sizep = size - len;
36 }
37
38 static const unsigned char *extract(void *tree, unsigned long size, const char **pathp, unsigned int *modep)
39 {
40 int len = strlen(tree)+1;
41 const unsigned char *sha1 = tree + len;
42 const char *path = strchr(tree, ' ');
43
44 if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1)
45 die("corrupt tree file");
46 *pathp = path+1;
47 return sha1;
48 }
49
50 static char *malloc_base(const char *base, const char *path, int pathlen)
51 {
52 int baselen = strlen(base);
53 char *newbase = xmalloc(baselen + pathlen + 2);
54 memcpy(newbase, base, baselen);
55 memcpy(newbase + baselen, path, pathlen);
56 memcpy(newbase + baselen + pathlen, "/", 2);
57 return newbase;
58 }
59
60 static void show_file(const char *prefix, void *tree, unsigned long size, const char *base);
61 static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base);
62
63 /* A file entry went away or appeared */
64 static void show_file(const char *prefix, void *tree, unsigned long size, const char *base)
65 {
66 unsigned mode;
67 const char *path;
68 const unsigned char *sha1 = extract(tree, size, &path, &mode);
69
70 if (silent)
71 return;
72
73 if (recursive && S_ISDIR(mode)) {
74 char type[20];
75 unsigned long size;
76 char *newbase = malloc_base(base, path, strlen(path));
77 void *tree;
78
79 tree = read_sha1_file(sha1, type, &size);
80 if (!tree || strcmp(type, "tree"))
81 die("corrupt tree sha %s", sha1_to_hex(sha1));
82
83 show_tree(prefix, tree, size, newbase);
84
85 free(tree);
86 free(newbase);
87 return;
88 }
89
90 diff_addremove(prefix[0], mode, sha1, base, path);
91 }
92
93 static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
94 {
95 unsigned mode1, mode2;
96 const char *path1, *path2;
97 const unsigned char *sha1, *sha2;
98 int cmp, pathlen1, pathlen2;
99
100 sha1 = extract(tree1, size1, &path1, &mode1);
101 sha2 = extract(tree2, size2, &path2, &mode2);
102
103 pathlen1 = strlen(path1);
104 pathlen2 = strlen(path2);
105 cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2);
106 if (cmp < 0) {
107 show_file("-", tree1, size1, base);
108 return -1;
109 }
110 if (cmp > 0) {
111 show_file("+", tree2, size2, base);
112 return 1;
113 }
114 if (!memcmp(sha1, sha2, 20) && mode1 == mode2)
115 return 0;
116
117 /*
118 * If the filemode has changed to/from a directory from/to a regular
119 * file, we need to consider it a remove and an add.
120 */
121 if (S_ISDIR(mode1) != S_ISDIR(mode2)) {
122 show_file("-", tree1, size1, base);
123 show_file("+", tree2, size2, base);
124 return 0;
125 }
126
127 if (recursive && S_ISDIR(mode1)) {
128 int retval;
129 char *newbase = malloc_base(base, path1, pathlen1);
130 retval = diff_tree_sha1(sha1, sha2, newbase);
131 free(newbase);
132 return retval;
133 }
134
135 if (silent)
136 return 0;
137
138 diff_change(mode1, mode2, sha1, sha2, base, path1);
139 return 0;
140 }
141
142 static int interesting(void *tree, unsigned long size, const char *base)
143 {
144 const char *path;
145 unsigned mode;
146 int i;
147 int baselen, pathlen;
148
149 if (!nr_paths)
150 return 1;
151
152 (void)extract(tree, size, &path, &mode);
153
154 pathlen = strlen(path);
155 baselen = strlen(base);
156
157 for (i=0; i < nr_paths; i++) {
158 const char *match = paths[i];
159 int matchlen = pathlens[i];
160
161 if (baselen >= matchlen) {
162 /* If it doesn't match, move along... */
163 if (strncmp(base, match, matchlen))
164 continue;
165
166 /* The base is a subdirectory of a path which was specified. */
167 return 1;
168 }
169
170 /* Does the base match? */
171 if (strncmp(base, match, baselen))
172 continue;
173
174 match += baselen;
175 matchlen -= baselen;
176
177 if (pathlen > matchlen)
178 continue;
179
180 if (matchlen > pathlen) {
181 if (match[pathlen] != '/')
182 continue;
183 if (!S_ISDIR(mode))
184 continue;
185 }
186
187 if (strncmp(path, match, pathlen))
188 continue;
189
190 return 1;
191 }
192 return 0; /* No matches */
193 }
194
195 /* A whole sub-tree went away or appeared */
196 static void show_tree(const char *prefix, void *tree, unsigned long size, const char *base)
197 {
198 while (size) {
199 if (interesting(tree, size, base))
200 show_file(prefix, tree, size, base);
201 update_tree_entry(&tree, &size);
202 }
203 }
204
205 static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
206 {
207 while (size1 | size2) {
208 if (nr_paths && size1 && !interesting(tree1, size1, base)) {
209 update_tree_entry(&tree1, &size1);
210 continue;
211 }
212 if (nr_paths && size2 && !interesting(tree2, size2, base)) {
213 update_tree_entry(&tree2, &size2);
214 continue;
215 }
216 if (!size1) {
217 show_file("+", tree2, size2, base);
218 update_tree_entry(&tree2, &size2);
219 continue;
220 }
221 if (!size2) {
222 show_file("-", tree1, size1, base);
223 update_tree_entry(&tree1, &size1);
224 continue;
225 }
226 switch (compare_tree_entry(tree1, size1, tree2, size2, base)) {
227 case -1:
228 update_tree_entry(&tree1, &size1);
229 continue;
230 case 0:
231 update_tree_entry(&tree1, &size1);
232 /* Fallthrough */
233 case 1:
234 update_tree_entry(&tree2, &size2);
235 continue;
236 }
237 die("git-diff-tree: internal error");
238 }
239 return 0;
240 }
241
242 static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base)
243 {
244 void *tree1, *tree2;
245 unsigned long size1, size2;
246 int retval;
247
248 tree1 = read_object_with_reference(old, "tree", &size1, NULL);
249 if (!tree1)
250 die("unable to read source tree (%s)", sha1_to_hex(old));
251 tree2 = read_object_with_reference(new, "tree", &size2, NULL);
252 if (!tree2)
253 die("unable to read destination tree (%s)", sha1_to_hex(new));
254 retval = diff_tree(tree1, size1, tree2, size2, base);
255 free(tree1);
256 free(tree2);
257 return retval;
258 }
259
260 static void call_diff_setup(void)
261 {
262 diff_setup(reverse_diff);
263 }
264
265 static int call_diff_flush()
266 {
267 if (detect_rename)
268 diffcore_rename(detect_rename, diff_score_opt);
269 diffcore_prune();
270 if (pickaxe) {
271 diffcore_pickaxe(pickaxe);
272 if (diff_queue_is_empty()) {
273 diff_flush(DIFF_FORMAT_NO_OUTPUT);
274 return 0;
275 }
276 }
277 if (nr_paths)
278 diffcore_pathspec(paths);
279 if (header) {
280 printf("%s", header);
281 header = NULL;
282 }
283 diff_flush(diff_output_format);
284 return 1;
285 }
286
287 static int diff_tree_sha1_top(const unsigned char *old,
288 const unsigned char *new, const char *base)
289 {
290 int ret;
291
292 call_diff_setup();
293 ret = diff_tree_sha1(old, new, base);
294 call_diff_flush();
295 return ret;
296 }
297
298 static int diff_root_tree(const unsigned char *new, const char *base)
299 {
300 int retval;
301 void *tree;
302 unsigned long size;
303
304 call_diff_setup();
305 tree = read_object_with_reference(new, "tree", &size, NULL);
306 if (!tree)
307 die("unable to read root tree (%s)", sha1_to_hex(new));
308 retval = diff_tree("", 0, tree, size, base);
309 free(tree);
310 call_diff_flush();
311 return retval;
312 }
313
314 static int get_one_line(const char *msg, unsigned long len)
315 {
316 int ret = 0;
317
318 while (len--) {
319 ret++;
320 if (*msg++ == '\n')
321 break;
322 }
323 return ret;
324 }
325
326 static int add_author_info(char *buf, const char *line, int len)
327 {
328 char *date;
329 unsigned int namelen;
330 unsigned long time;
331 int tz;
332
333 line += strlen("author ");
334 date = strchr(line, '>');
335 if (!date)
336 return 0;
337 namelen = ++date - line;
338 time = strtoul(date, &date, 10);
339 tz = strtol(date, NULL, 10);
340
341 return sprintf(buf, "Author: %.*s\nDate: %s\n",
342 namelen, line,
343 show_date(time, tz));
344 }
345
346 static char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
347 {
348 static char this_header[16384];
349 int offset;
350
351 offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
352 if (verbose_header) {
353 int hdr = 1;
354
355 for (;;) {
356 const char *line = msg;
357 int linelen = get_one_line(msg, len);
358
359 if (!linelen)
360 break;
361
362 /*
363 * We want some slop for indentation and a possible
364 * final "...". Thus the "+ 20".
365 */
366 if (offset + linelen + 20 > sizeof(this_header)) {
367 memcpy(this_header + offset, " ...\n", 8);
368 offset += 8;
369 break;
370 }
371
372 msg += linelen;
373 len -= linelen;
374 if (linelen == 1)
375 hdr = 0;
376 if (hdr) {
377 if (!memcmp(line, "author ", 7))
378 offset += add_author_info(this_header + offset, line, linelen);
379 continue;
380 }
381 memset(this_header + offset, ' ', 4);
382 memcpy(this_header + offset + 4, line, linelen);
383 offset += linelen + 4;
384 }
385 /* Make sure there is an EOLN */
386 if (this_header[offset-1] != '\n')
387 this_header[offset++] = '\n';
388 /* Add _another_ EOLN if we are doing diff output */
389 if (!silent)
390 this_header[offset++] = '\n';
391 this_header[offset] = 0;
392 }
393
394 return this_header;
395 }
396
397 static int diff_tree_commit(const unsigned char *commit, const char *name)
398 {
399 unsigned long size, offset;
400 char *buf = read_object_with_reference(commit, "commit", &size, NULL);
401
402 if (!buf)
403 return -1;
404
405 if (!name) {
406 static char commit_name[60];
407 strcpy(commit_name, sha1_to_hex(commit));
408 name = commit_name;
409 }
410
411 /* Root commit? */
412 if (show_root_diff && memcmp(buf + 46, "parent ", 7)) {
413 header = generate_header(name, "root", buf, size);
414 diff_root_tree(commit, "");
415 }
416
417 /* More than one parent? */
418 if (ignore_merges) {
419 if (!memcmp(buf + 46 + 48, "parent ", 7))
420 return 0;
421 }
422
423 offset = 46;
424 while (offset + 48 < size && !memcmp(buf + offset, "parent ", 7)) {
425 unsigned char parent[20];
426 if (get_sha1_hex(buf + offset + 7, parent))
427 return -1;
428 header = generate_header(name, sha1_to_hex(parent), buf, size);
429 diff_tree_sha1_top(parent, commit, "");
430 if (!header && verbose_header) {
431 header_prefix = "\ndiff-tree ";
432 /*
433 * Don't print multiple merge entries if we
434 * don't print the diffs.
435 */
436 if (silent)
437 break;
438 }
439 offset += 48;
440 }
441 return 0;
442 }
443
444 static int diff_tree_stdin(char *line)
445 {
446 int len = strlen(line);
447 unsigned char commit[20], parent[20];
448 static char this_header[1000];
449
450 if (!len || line[len-1] != '\n')
451 return -1;
452 line[len-1] = 0;
453 if (get_sha1_hex(line, commit))
454 return -1;
455 if (isspace(line[40]) && !get_sha1_hex(line+41, parent)) {
456 line[40] = 0;
457 line[81] = 0;
458 sprintf(this_header, "%s (from %s)\n", line, line+41);
459 header = this_header;
460 return diff_tree_sha1_top(parent, commit, "");
461 }
462 line[40] = 0;
463 return diff_tree_commit(commit, line);
464 }
465
466 static char *diff_tree_usage =
467 "git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-m] [-s] [-v] <tree-ish> <tree-ish>";
468
469 int main(int argc, const char **argv)
470 {
471 int nr_sha1;
472 char line[1000];
473 unsigned char sha1[2][20];
474
475 nr_sha1 = 0;
476 for (;;) {
477 const char *arg;
478
479 argv++;
480 argc--;
481 arg = *argv;
482 if (!arg)
483 break;
484
485 if (*arg != '-') {
486 if (nr_sha1 < 2 && !get_sha1(arg, sha1[nr_sha1])) {
487 nr_sha1++;
488 continue;
489 }
490 break;
491 }
492
493 if (!strcmp(arg, "--")) {
494 argv++;
495 argc--;
496 break;
497 }
498 if (!strcmp(arg, "-r")) {
499 recursive = 1;
500 continue;
501 }
502 if (!strcmp(arg, "-R")) {
503 reverse_diff = 1;
504 continue;
505 }
506 if (!strcmp(arg, "-p")) {
507 diff_output_format = DIFF_FORMAT_PATCH;
508 recursive = 1;
509 continue;
510 }
511 if (!strncmp(arg, "-S", 2)) {
512 pickaxe = arg + 2;
513 continue;
514 }
515 if (!strncmp(arg, "-M", 2)) {
516 detect_rename = DIFF_DETECT_RENAME;
517 diff_score_opt = diff_scoreopt_parse(arg);
518 continue;
519 }
520 if (!strncmp(arg, "-C", 2)) {
521 detect_rename = DIFF_DETECT_COPY;
522 diff_score_opt = diff_scoreopt_parse(arg);
523 continue;
524 }
525 if (!strcmp(arg, "-z")) {
526 diff_output_format = DIFF_FORMAT_MACHINE;
527 continue;
528 }
529 if (!strcmp(arg, "-m")) {
530 ignore_merges = 0;
531 continue;
532 }
533 if (!strcmp(arg, "-s")) {
534 silent = 1;
535 continue;
536 }
537 if (!strcmp(arg, "-v")) {
538 verbose_header = 1;
539 header_prefix = "diff-tree ";
540 continue;
541 }
542 if (!strcmp(arg, "--stdin")) {
543 read_stdin = 1;
544 continue;
545 }
546 if (!strcmp(arg, "--root")) {
547 show_root_diff = 1;
548 continue;
549 }
550 usage(diff_tree_usage);
551 }
552
553 if (argc > 0) {
554 int i;
555
556 paths = argv;
557 nr_paths = argc;
558 pathlens = xmalloc(nr_paths * sizeof(int));
559 for (i=0; i<nr_paths; i++)
560 pathlens[i] = strlen(paths[i]);
561 }
562
563 switch (nr_sha1) {
564 case 0:
565 if (!read_stdin)
566 usage(diff_tree_usage);
567 break;
568 case 1:
569 diff_tree_commit(sha1[0], NULL);
570 break;
571 case 2:
572 diff_tree_sha1_top(sha1[0], sha1[1], "");
573 break;
574 }
575
576 if (!read_stdin)
577 return 0;
578
579 while (fgets(line, sizeof(line), stdin))
580 diff_tree_stdin(line);
581
582 return 0;
583 }