-rw-r--r-- | ui-commit.c | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/ui-commit.c b/ui-commit.c index 3618800..f1a22d3 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -65,83 +65,48 @@ void print_filepair(struct diff_filepair *pair) | |||
65 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), | 65 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), |
66 | NULL, NULL); | 66 | NULL, NULL); |
67 | if (pair->status == DIFF_STATUS_COPIED || | 67 | if (pair->status == DIFF_STATUS_COPIED || |
68 | pair->status == DIFF_STATUS_RENAMED) { | 68 | pair->status == DIFF_STATUS_RENAMED) { |
69 | html_txt(pair->two->path); | 69 | html_txt(pair->two->path); |
70 | htmlf("</a> (%s from ", pair->status == DIFF_STATUS_COPIED ? | 70 | htmlf("</a> (%s from ", pair->status == DIFF_STATUS_COPIED ? |
71 | "copied" : "renamed"); | 71 | "copied" : "renamed"); |
72 | query = fmt("id=%s", sha1_to_hex(pair->one->sha1)); | 72 | query = fmt("id=%s", sha1_to_hex(pair->one->sha1)); |
73 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query), | 73 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query), |
74 | NULL, NULL); | 74 | NULL, NULL); |
75 | html_txt(pair->one->path); | 75 | html_txt(pair->one->path); |
76 | html("</a>)"); | 76 | html("</a>)"); |
77 | } else { | 77 | } else { |
78 | html_txt(pair->two->path); | 78 | html_txt(pair->two->path); |
79 | html("</a>"); | 79 | html("</a>"); |
80 | } | 80 | } |
81 | html("<td>"); | 81 | html("<td>"); |
82 | 82 | ||
83 | //TODO: diffstat graph | 83 | //TODO: diffstat graph |
84 | 84 | ||
85 | html("</td></tr>\n"); | 85 | html("</td></tr>\n"); |
86 | files++; | 86 | files++; |
87 | } | 87 | } |
88 | 88 | ||
89 | void diff_format_cb(struct diff_queue_struct *q, | ||
90 | struct diff_options *options, void *data) | ||
91 | { | ||
92 | int i; | ||
93 | |||
94 | for (i = 0; i < q->nr; i++) { | ||
95 | if (q->queue[i]->status == 'U') | ||
96 | continue; | ||
97 | print_filepair(q->queue[i]); | ||
98 | } | ||
99 | } | ||
100 | |||
101 | void cgit_diffstat(struct commit *commit) | ||
102 | { | ||
103 | struct diff_options opt; | ||
104 | int ret; | ||
105 | |||
106 | diff_setup(&opt); | ||
107 | opt.output_format = DIFF_FORMAT_CALLBACK; | ||
108 | opt.detect_rename = 1; | ||
109 | opt.recursive = 1; | ||
110 | opt.format_callback = diff_format_cb; | ||
111 | diff_setup_done(&opt); | ||
112 | |||
113 | if (commit->parents) | ||
114 | ret = diff_tree_sha1(commit->parents->item->object.sha1, | ||
115 | commit->object.sha1, | ||
116 | "", &opt); | ||
117 | else | ||
118 | ret = diff_root_tree_sha1(commit->object.sha1, "", &opt); | ||
119 | |||
120 | diffcore_std(&opt); | ||
121 | diff_flush(&opt); | ||
122 | } | ||
123 | |||
124 | void cgit_print_commit(const char *hex) | 89 | void cgit_print_commit(const char *hex) |
125 | { | 90 | { |
126 | struct commit *commit; | 91 | struct commit *commit; |
127 | struct commitinfo *info; | 92 | struct commitinfo *info; |
128 | struct commit_list *p; | 93 | struct commit_list *p; |
129 | unsigned char sha1[20]; | 94 | unsigned char sha1[20]; |
130 | char *query; | 95 | char *query; |
131 | char *filename; | 96 | char *filename; |
132 | 97 | ||
133 | if (get_sha1(hex, sha1)) { | 98 | if (get_sha1(hex, sha1)) { |
134 | cgit_print_error(fmt("Bad object id: %s", hex)); | 99 | cgit_print_error(fmt("Bad object id: %s", hex)); |
135 | return; | 100 | return; |
136 | } | 101 | } |
137 | commit = lookup_commit_reference(sha1); | 102 | commit = lookup_commit_reference(sha1); |
138 | if (!commit) { | 103 | if (!commit) { |
139 | cgit_print_error(fmt("Bad commit reference: %s", hex)); | 104 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
140 | return; | 105 | return; |
141 | } | 106 | } |
142 | info = cgit_parse_commit(commit); | 107 | info = cgit_parse_commit(commit); |
143 | 108 | ||
144 | html("<table class='commit-info'>\n"); | 109 | html("<table class='commit-info'>\n"); |
145 | html("<tr><th>author</th><td>"); | 110 | html("<tr><th>author</th><td>"); |
146 | html_txt(info->author); | 111 | html_txt(info->author); |
147 | html(" "); | 112 | html(" "); |
@@ -155,40 +120,39 @@ void cgit_print_commit(const char *hex) | |||
155 | html_txt(info->committer_email); | 120 | html_txt(info->committer_email); |
156 | html("</td><td class='right'>"); | 121 | html("</td><td class='right'>"); |
157 | cgit_print_date(info->committer_date); | 122 | cgit_print_date(info->committer_date); |
158 | html("</td></tr>\n"); | 123 | html("</td></tr>\n"); |
159 | html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); | 124 | html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); |
160 | query = fmt("id=%s", sha1_to_hex(commit->tree->object.sha1)); | 125 | query = fmt("id=%s", sha1_to_hex(commit->tree->object.sha1)); |
161 | html_attr(cgit_pageurl(cgit_query_repo, "tree", query)); | 126 | html_attr(cgit_pageurl(cgit_query_repo, "tree", query)); |
162 | htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1)); | 127 | htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1)); |
163 | for (p = commit->parents; p ; p = p->next) { | 128 | for (p = commit->parents; p ; p = p->next) { |
164 | html("<tr><th>parent</th>" | 129 | html("<tr><th>parent</th>" |
165 | "<td colspan='2' class='sha1'>" | 130 | "<td colspan='2' class='sha1'>" |
166 | "<a href='"); | 131 | "<a href='"); |
167 | query = fmt("id=%s", sha1_to_hex(p->item->object.sha1)); | 132 | query = fmt("id=%s", sha1_to_hex(p->item->object.sha1)); |
168 | html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); | 133 | html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); |
169 | htmlf("'>%s</a></td></tr>\n", | 134 | htmlf("'>%s</a></td></tr>\n", |
170 | sha1_to_hex(p->item->object.sha1)); | 135 | sha1_to_hex(p->item->object.sha1)); |
171 | } | 136 | } |
172 | if (cgit_repo->snapshots) { | 137 | if (cgit_repo->snapshots) { |
173 | htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); | 138 | htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); |
174 | filename = fmt("%s-%s.zip", cgit_query_repo, hex); | 139 | filename = fmt("%s-%s.zip", cgit_query_repo, hex); |
175 | html_attr(cgit_pageurl(cgit_query_repo, "snapshot", | 140 | html_attr(cgit_pageurl(cgit_query_repo, "snapshot", |
176 | fmt("id=%s&name=%s", hex, filename))); | 141 | fmt("id=%s&name=%s", hex, filename))); |
177 | htmlf("'>%s</a></td></tr>", filename); | 142 | htmlf("'>%s</a></td></tr>", filename); |
178 | } | 143 | } |
179 | |||
180 | html("</table>\n"); | 144 | html("</table>\n"); |
181 | html("<div class='commit-subject'>"); | 145 | html("<div class='commit-subject'>"); |
182 | html_txt(info->subject); | 146 | html_txt(info->subject); |
183 | html("</div>"); | 147 | html("</div>"); |
184 | html("<div class='commit-msg'>"); | 148 | html("<div class='commit-msg'>"); |
185 | html_txt(info->msg); | 149 | html_txt(info->msg); |
186 | html("</div>"); | 150 | html("</div>"); |
187 | html("<table class='diffstat'>"); | 151 | html("<table class='diffstat'>"); |
188 | html("<tr><th colspan='3'>Affected files</tr>\n"); | 152 | html("<tr><th colspan='3'>Affected files</tr>\n"); |
189 | cgit_diffstat(commit); | 153 | cgit_diff_commit(commit, print_filepair); |
190 | htmlf("<tr><td colspan='3' class='summary'>" | 154 | htmlf("<tr><td colspan='3' class='summary'>" |
191 | "%d file%s changed</td></tr>\n", files, files > 1 ? "s" : ""); | 155 | "%d file%s changed</td></tr>\n", files, files > 1 ? "s" : ""); |
192 | html("</table>"); | 156 | html("</table>"); |
193 | cgit_free_commitinfo(info); | 157 | cgit_free_commitinfo(info); |
194 | } | 158 | } |