summaryrefslogtreecommitdiffabout
path: root/ui-commit.c
Unidiff
Diffstat (limited to 'ui-commit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-commit.c66
1 files changed, 15 insertions, 51 deletions
diff --git a/ui-commit.c b/ui-commit.c
index 3618800..f1a22d3 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,194 +1,158 @@
1/* ui-commit.c: generate commit view 1/* ui-commit.c: generate commit view
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10 10
11int files = 0; 11int files = 0;
12 12
13void print_filepair(struct diff_filepair *pair) 13void print_filepair(struct diff_filepair *pair)
14{ 14{
15 char *query; 15 char *query;
16 char *class; 16 char *class;
17 17
18 switch (pair->status) { 18 switch (pair->status) {
19 case DIFF_STATUS_ADDED: 19 case DIFF_STATUS_ADDED:
20 class = "add"; 20 class = "add";
21 break; 21 break;
22 case DIFF_STATUS_COPIED: 22 case DIFF_STATUS_COPIED:
23 class = "cpy"; 23 class = "cpy";
24 break; 24 break;
25 case DIFF_STATUS_DELETED: 25 case DIFF_STATUS_DELETED:
26 class = "del"; 26 class = "del";
27 break; 27 break;
28 case DIFF_STATUS_MODIFIED: 28 case DIFF_STATUS_MODIFIED:
29 class = "upd"; 29 class = "upd";
30 break; 30 break;
31 case DIFF_STATUS_RENAMED: 31 case DIFF_STATUS_RENAMED:
32 class = "mov"; 32 class = "mov";
33 break; 33 break;
34 case DIFF_STATUS_TYPE_CHANGED: 34 case DIFF_STATUS_TYPE_CHANGED:
35 class = "typ"; 35 class = "typ";
36 break; 36 break;
37 case DIFF_STATUS_UNKNOWN: 37 case DIFF_STATUS_UNKNOWN:
38 class = "unk"; 38 class = "unk";
39 break; 39 break;
40 case DIFF_STATUS_UNMERGED: 40 case DIFF_STATUS_UNMERGED:
41 class = "stg"; 41 class = "stg";
42 break; 42 break;
43 default: 43 default:
44 die("bug: unhandled diff status %c", pair->status); 44 die("bug: unhandled diff status %c", pair->status);
45 } 45 }
46 46
47 html("<tr>"); 47 html("<tr>");
48 htmlf("<td class='mode'>"); 48 htmlf("<td class='mode'>");
49 if (is_null_sha1(pair->two->sha1)) { 49 if (is_null_sha1(pair->two->sha1)) {
50 html_filemode(pair->one->mode); 50 html_filemode(pair->one->mode);
51 } else { 51 } else {
52 html_filemode(pair->two->mode); 52 html_filemode(pair->two->mode);
53 } 53 }
54 54
55 if (pair->one->mode != pair->two->mode && 55 if (pair->one->mode != pair->two->mode &&
56 !is_null_sha1(pair->one->sha1) && 56 !is_null_sha1(pair->one->sha1) &&
57 !is_null_sha1(pair->two->sha1)) { 57 !is_null_sha1(pair->two->sha1)) {
58 html("<span class='modechange'>["); 58 html("<span class='modechange'>[");
59 html_filemode(pair->one->mode); 59 html_filemode(pair->one->mode);
60 html("]</span>"); 60 html("]</span>");
61 } 61 }
62 htmlf("</td><td class='%s'>", class); 62 htmlf("</td><td class='%s'>", class);
63 query = fmt("id=%s&id2=%s", sha1_to_hex(pair->one->sha1), 63 query = fmt("id=%s&id2=%s", sha1_to_hex(pair->one->sha1),
64 sha1_to_hex(pair->two->sha1)); 64 sha1_to_hex(pair->two->sha1));
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
85 html("</td></tr>\n");
86 files++;
87}
88
89void 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
101void 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 84
120 diffcore_std(&opt); 85 html("</td></tr>\n");
121 diff_flush(&opt); 86 files++;
122} 87}
123 88
124void cgit_print_commit(const char *hex) 89void 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(" ");
148 html_txt(info->author_email); 113 html_txt(info->author_email);
149 html("</td><td class='right'>"); 114 html("</td><td class='right'>");
150 cgit_print_date(info->author_date); 115 cgit_print_date(info->author_date);
151 html("</td></tr>\n"); 116 html("</td></tr>\n");
152 html("<tr><th>committer</th><td>"); 117 html("<tr><th>committer</th><td>");
153 html_txt(info->committer); 118 html_txt(info->committer);
154 html(" "); 119 html(" ");
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}