]>
Commit | Line | Data |
---|---|---|
9174026c | 1 | #include "cache.h" |
3ebfd4aa | 2 | #include "diff.h" |
e3bc7a3b | 3 | #include "commit.h" |
5f1c3f07 | 4 | #include "log-tree.h" |
e8cc9cd9 | 5 | #include "builtin.h" |
9174026c | 6 | |
cd2bdc53 | 7 | static struct rev_info log_tree_opt; |
b11645be | 8 | |
45392a64 JH |
9 | static int diff_tree_commit_sha1(const unsigned char *sha1) |
10 | { | |
11 | struct commit *commit = lookup_commit_reference(sha1); | |
12 | if (!commit) | |
13 | return -1; | |
5f1c3f07 | 14 | return log_tree_commit(&log_tree_opt, commit); |
45392a64 JH |
15 | } |
16 | ||
b11645be LT |
17 | static int diff_tree_stdin(char *line) |
18 | { | |
19 | int len = strlen(line); | |
45392a64 JH |
20 | unsigned char sha1[20]; |
21 | struct commit *commit; | |
b11645be LT |
22 | |
23 | if (!len || line[len-1] != '\n') | |
24 | return -1; | |
25 | line[len-1] = 0; | |
45392a64 JH |
26 | if (get_sha1_hex(line, sha1)) |
27 | return -1; | |
28 | commit = lookup_commit(sha1); | |
29 | if (!commit || parse_commit(commit)) | |
b11645be | 30 | return -1; |
45392a64 JH |
31 | if (isspace(line[40]) && !get_sha1_hex(line+41, sha1)) { |
32 | /* Graft the fake parents locally to the commit */ | |
33 | int pos = 41; | |
34 | struct commit_list **pptr, *parents; | |
35 | ||
36 | /* Free the real parent list */ | |
37 | for (parents = commit->parents; parents; ) { | |
38 | struct commit_list *tmp = parents->next; | |
39 | free(parents); | |
40 | parents = tmp; | |
41 | } | |
42 | commit->parents = NULL; | |
43 | pptr = &(commit->parents); | |
44 | while (line[pos] && !get_sha1_hex(line + pos, sha1)) { | |
45 | struct commit *parent = lookup_commit(sha1); | |
46 | if (parent) { | |
47 | pptr = &commit_list_insert(parent, pptr)->next; | |
48 | } | |
49 | pos += 41; | |
50 | } | |
b11645be | 51 | } |
5f1c3f07 | 52 | return log_tree_commit(&log_tree_opt, commit); |
e0965d83 LT |
53 | } |
54 | ||
4d1f1190 | 55 | static const char diff_tree_usage[] = |
d8f4790e | 56 | "git-diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] " |
50b8e355 CS |
57 | "[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n" |
58 | " -r diff recursively\n" | |
59 | " --root include the initial commit as diff against /dev/null\n" | |
dda2d79a | 60 | COMMON_DIFF_OPTIONS_HELP; |
a8db165e | 61 | |
a633fca0 | 62 | int cmd_diff_tree(int argc, const char **argv, const char *prefix) |
73134b6d | 63 | { |
0a8365a1 | 64 | int nr_sha1; |
e0965d83 | 65 | char line[1000]; |
cd2bdc53 LT |
66 | struct object *tree1, *tree2; |
67 | static struct rev_info *opt = &log_tree_opt; | |
5f1c3f07 | 68 | int read_stdin = 0; |
73134b6d | 69 | |
a633fca0 | 70 | init_revisions(opt, prefix); |
9a1805a8 | 71 | git_config(git_diff_basic_config); /* no "diff" UI options */ |
0a8365a1 | 72 | nr_sha1 = 0; |
8e8f9987 | 73 | opt->abbrev = 0; |
91539833 | 74 | opt->diff = 1; |
cd2bdc53 | 75 | argc = setup_revisions(argc, argv, opt, NULL); |
6b5ee137 | 76 | |
cd2bdc53 LT |
77 | while (--argc > 0) { |
78 | const char *arg = *++argv; | |
c5b42386 | 79 | |
e0965d83 LT |
80 | if (!strcmp(arg, "--stdin")) { |
81 | read_stdin = 1; | |
82 | continue; | |
83 | } | |
c5bac17a | 84 | usage(diff_tree_usage); |
73134b6d LT |
85 | } |
86 | ||
c9b5ef99 TH |
87 | if (!opt->diffopt.output_format) |
88 | opt->diffopt.output_format = DIFF_FORMAT_RAW; | |
89 | ||
cd2bdc53 | 90 | /* |
1f1e895f LT |
91 | * NOTE! We expect "a ^b" to be equal to "a..b", so we |
92 | * reverse the order of the objects if the second one | |
93 | * is marked UNINTERESTING. | |
cd2bdc53 | 94 | */ |
1f1e895f | 95 | nr_sha1 = opt->pending.nr; |
0a8365a1 LT |
96 | switch (nr_sha1) { |
97 | case 0: | |
98 | if (!read_stdin) | |
99 | usage(diff_tree_usage); | |
100 | break; | |
101 | case 1: | |
1f1e895f | 102 | tree1 = opt->pending.objects[0].item; |
cd2bdc53 | 103 | diff_tree_commit_sha1(tree1->sha1); |
0a8365a1 LT |
104 | break; |
105 | case 2: | |
1f1e895f LT |
106 | tree1 = opt->pending.objects[0].item; |
107 | tree2 = opt->pending.objects[1].item; | |
108 | if (tree2->flags & UNINTERESTING) { | |
109 | struct object *tmp = tree2; | |
110 | tree2 = tree1; | |
111 | tree1 = tmp; | |
112 | } | |
cd2bdc53 LT |
113 | diff_tree_sha1(tree1->sha1, |
114 | tree2->sha1, | |
115 | "", &opt->diffopt); | |
5f1c3f07 | 116 | log_tree_diff_flush(opt); |
0a8365a1 LT |
117 | break; |
118 | } | |
119 | ||
62c64895 WC |
120 | if (read_stdin) { |
121 | if (opt->diffopt.detect_rename) | |
122 | opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE | | |
123 | DIFF_SETUP_USE_CACHE); | |
124 | while (fgets(line, sizeof(line), stdin)) { | |
125 | unsigned char sha1[20]; | |
e0965d83 | 126 | |
62c64895 WC |
127 | if (get_sha1_hex(line, sha1)) { |
128 | fputs(line, stdout); | |
129 | fflush(stdout); | |
130 | } | |
131 | else | |
132 | diff_tree_stdin(line); | |
e0c97ca6 | 133 | } |
e0c97ca6 | 134 | } |
da31b358 JH |
135 | |
136 | return diff_result_code(&opt->diffopt, 0); | |
9174026c | 137 | } |