summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-06-17 16:12:03 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-06-17 16:12:03 (UTC)
commit4a0be586662843382ecfa53af34a13b291312bc0 (patch) (unidiff)
tree01e0cd725fe249df3449bb089aad9f8d58081f89
parentfaaca447b071592c9a1e1f14b4d0d2a39b4c795a (diff)
downloadcgit-4a0be586662843382ecfa53af34a13b291312bc0.zip
cgit-4a0be586662843382ecfa53af34a13b291312bc0.tar.gz
cgit-4a0be586662843382ecfa53af34a13b291312bc0.tar.bz2
Add cgit_diff_link()
This adds a new function used to generate links to the diff page and uses it everywhere such links appear (expect for single files in the diffstat displayed on the commit page: this is now a link to the tree page). The updated diff-page now expects zero, one or two revision specifiers, in parameters head, id and id2. Id defaults to head unless otherwise specified, while head (as usual) defaults to repo.defbranch. If id2 isn't specified, it defaults to the first parent of id1. The most important change is of course that now all repo pages (summary, log, tree, commit and diff) has support for passing on the current branch and revision, i.e. the road is now open for a 'static' menu with links to all of these pages. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c3
-rw-r--r--cgit.h7
-rw-r--r--shared.c2
-rw-r--r--ui-commit.c46
-rw-r--r--ui-diff.c64
-rw-r--r--ui-shared.c22
6 files changed, 75 insertions, 69 deletions
diff --git a/cgit.c b/cgit.c
index b936a70..3fc90bf 100644
--- a/cgit.c
+++ b/cgit.c
@@ -100,14 +100,13 @@ static void cgit_print_repo_page(struct cacheitem *item)
100 cgit_print_tree(cgit_query_sha1, cgit_query_path); 100 cgit_print_tree(cgit_query_sha1, cgit_query_path);
101 break; 101 break;
102 case CMD_COMMIT: 102 case CMD_COMMIT:
103 cgit_print_commit(cgit_query_sha1); 103 cgit_print_commit(cgit_query_sha1);
104 break; 104 break;
105 case CMD_DIFF: 105 case CMD_DIFF:
106 cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2, 106 cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
107 cgit_query_path);
108 break; 107 break;
109 default: 108 default:
110 cgit_print_error("Invalid request"); 109 cgit_print_error("Invalid request");
111 } 110 }
112 cgit_print_docend(); 111 cgit_print_docend();
113} 112}
diff --git a/cgit.h b/cgit.h
index c276a24..bd2dd0d 100644
--- a/cgit.h
+++ b/cgit.h
@@ -204,12 +204,14 @@ extern char *cgit_pageurl(const char *reponame, const char *pagename,
204extern void cgit_tree_link(char *name, char *title, char *class, char *head, 204extern void cgit_tree_link(char *name, char *title, char *class, char *head,
205 char *rev, char *path); 205 char *rev, char *path);
206extern void cgit_log_link(char *name, char *title, char *class, char *head, 206extern void cgit_log_link(char *name, char *title, char *class, char *head,
207 char *rev, char *path); 207 char *rev, char *path);
208extern void cgit_commit_link(char *name, char *title, char *class, char *head, 208extern void cgit_commit_link(char *name, char *title, char *class, char *head,
209 char *rev); 209 char *rev);
210extern void cgit_diff_link(char *name, char *title, char *class, char *head,
211 char *new_rev, char *old_rev, char *path);
210 212
211extern void cgit_print_error(char *msg); 213extern void cgit_print_error(char *msg);
212extern void cgit_print_date(time_t secs, char *format); 214extern void cgit_print_date(time_t secs, char *format);
213extern void cgit_print_age(time_t t, time_t max_relative, char *format); 215extern void cgit_print_age(time_t t, time_t max_relative, char *format);
214extern void cgit_print_docstart(char *title, struct cacheitem *item); 216extern void cgit_print_docstart(char *title, struct cacheitem *item);
215extern void cgit_print_docend(); 217extern void cgit_print_docend();
@@ -220,14 +222,13 @@ extern void cgit_print_snapshot_start(const char *mimetype,
220 222
221extern void cgit_print_repolist(struct cacheitem *item); 223extern void cgit_print_repolist(struct cacheitem *item);
222extern void cgit_print_summary(); 224extern void cgit_print_summary();
223extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); 225extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager);
224extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); 226extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
225extern void cgit_print_tree(const char *rev, char *path); 227extern void cgit_print_tree(const char *rev, char *path);
226extern void cgit_print_commit(const char *hex); 228extern void cgit_print_commit(char *hex);
227extern void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, 229extern void cgit_print_diff(const char *new_hex, const char *old_hex);
228 char *path);
229extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, 230extern void cgit_print_snapshot(struct cacheitem *item, const char *hex,
230 const char *format, const char *prefix, 231 const char *format, const char *prefix,
231 const char *filename); 232 const char *filename);
232 233
233#endif /* CGIT_H */ 234#endif /* CGIT_H */
diff --git a/shared.c b/shared.c
index c7cd8a5..f20fb5c 100644
--- a/shared.c
+++ b/shared.c
@@ -357,13 +357,13 @@ void cgit_diff_tree(const unsigned char *old_sha1,
357 opt.detect_rename = 1; 357 opt.detect_rename = 1;
358 opt.recursive = 1; 358 opt.recursive = 1;
359 opt.format_callback = cgit_diff_tree_cb; 359 opt.format_callback = cgit_diff_tree_cb;
360 opt.format_callback_data = fn; 360 opt.format_callback_data = fn;
361 diff_setup_done(&opt); 361 diff_setup_done(&opt);
362 362
363 if (old_sha1) 363 if (old_sha1 && !is_null_sha1(old_sha1))
364 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); 364 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
365 else 365 else
366 ret = diff_root_tree_sha1(new_sha1, "", &opt); 366 ret = diff_root_tree_sha1(new_sha1, "", &opt);
367 diffcore_std(&opt); 367 diffcore_std(&opt);
368 diff_flush(&opt); 368 diff_flush(&opt);
369} 369}
diff --git a/ui-commit.c b/ui-commit.c
index d489d7c..2679b59 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -8,12 +8,13 @@
8 8
9#include "cgit.h" 9#include "cgit.h"
10 10
11static int files, slots; 11static int files, slots;
12static int total_adds, total_rems, max_changes; 12static int total_adds, total_rems, max_changes;
13static int lines_added, lines_removed; 13static int lines_added, lines_removed;
14static char *curr_rev;
14 15
15static struct fileinfo { 16static struct fileinfo {
16 char status; 17 char status;
17 unsigned char old_sha1[20]; 18 unsigned char old_sha1[20];
18 unsigned char new_sha1[20]; 19 unsigned char new_sha1[20];
19 unsigned short old_mode; 20 unsigned short old_mode;
@@ -24,13 +25,12 @@ static struct fileinfo {
24 unsigned int removed; 25 unsigned int removed;
25} *items; 26} *items;
26 27
27 28
28void print_fileinfo(struct fileinfo *info) 29void print_fileinfo(struct fileinfo *info)
29{ 30{
30 char *query, *query2;
31 char *class; 31 char *class;
32 32
33 switch (info->status) { 33 switch (info->status) {
34 case DIFF_STATUS_ADDED: 34 case DIFF_STATUS_ADDED:
35 class = "add"; 35 class = "add";
36 break; 36 break;
@@ -72,30 +72,18 @@ void print_fileinfo(struct fileinfo *info)
72 !is_null_sha1(info->new_sha1)) { 72 !is_null_sha1(info->new_sha1)) {
73 html("<span class='modechange'>["); 73 html("<span class='modechange'>[");
74 html_filemode(info->old_mode); 74 html_filemode(info->old_mode);
75 html("]</span>"); 75 html("]</span>");
76 } 76 }
77 htmlf("</td><td class='%s'>", class); 77 htmlf("</td><td class='%s'>", class);
78 query = fmt("id=%s&amp;id2=%s&amp;path=%s", sha1_to_hex(info->old_sha1), 78 cgit_tree_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
79 sha1_to_hex(info->new_sha1), info->new_path); 79 info->new_path);
80 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), 80 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
81 NULL, NULL); 81 htmlf(" (%s from %s)",
82 if (info->status == DIFF_STATUS_COPIED || 82 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
83 info->status == DIFF_STATUS_RENAMED) { 83 info->old_path);
84 html_txt(info->new_path);
85 htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ?
86 "copied" : "renamed");
87 query2 = fmt("id=%s", sha1_to_hex(info->old_sha1));
88 html_link_open(cgit_pageurl(cgit_query_repo, "view", query2),
89 NULL, NULL);
90 html_txt(info->old_path);
91 html("</a>)");
92 } else {
93 html_txt(info->new_path);
94 html("</a>");
95 }
96 html("</td><td class='right'>"); 84 html("</td><td class='right'>");
97 htmlf("%d", info->added + info->removed); 85 htmlf("%d", info->added + info->removed);
98 html("</td><td class='graph'>"); 86 html("</td><td class='graph'>");
99 htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); 87 htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
100 htmlf("<td class='add' style='width: %.1f%%;'/>", 88 htmlf("<td class='add' style='width: %.1f%%;'/>",
101 info->added * 100.0 / max_changes); 89 info->added * 100.0 / max_changes);
@@ -142,25 +130,25 @@ void inspect_filepair(struct diff_filepair *pair)
142 max_changes = lines_added + lines_removed; 130 max_changes = lines_added + lines_removed;
143 total_adds += lines_added; 131 total_adds += lines_added;
144 total_rems += lines_removed; 132 total_rems += lines_removed;
145} 133}
146 134
147 135
148void cgit_print_commit(const char *hex) 136void cgit_print_commit(char *hex)
149{ 137{
150 struct commit *commit, *parent; 138 struct commit *commit, *parent;
151 struct commitinfo *info; 139 struct commitinfo *info;
152 struct commit_list *p; 140 struct commit_list *p;
153 unsigned char sha1[20]; 141 unsigned char sha1[20];
154 char *query;
155 char *filename; 142 char *filename;
156 char *tmp; 143 char *tmp;
157 int i; 144 int i;
158 145
159 if (!hex) 146 if (!hex)
160 hex = cgit_query_head; 147 hex = cgit_query_head;
148 curr_rev = hex;
161 149
162 if (get_sha1(hex, sha1)) { 150 if (get_sha1(hex, sha1)) {
163 cgit_print_error(fmt("Bad object id: %s", hex)); 151 cgit_print_error(fmt("Bad object id: %s", hex));
164 return; 152 return;
165 } 153 }
166 commit = lookup_commit_reference(sha1); 154 commit = lookup_commit_reference(sha1);
@@ -199,17 +187,16 @@ void cgit_print_commit(const char *hex)
199 continue; 187 continue;
200 } 188 }
201 html("<tr><th>parent</th>" 189 html("<tr><th>parent</th>"
202 "<td colspan='2' class='sha1'>"); 190 "<td colspan='2' class='sha1'>");
203 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, 191 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
204 cgit_query_head, sha1_to_hex(p->item->object.sha1)); 192 cgit_query_head, sha1_to_hex(p->item->object.sha1));
205 html(" (<a href='"); 193 html(" (");
206 query = fmt("id=%s&amp;id2=%s", sha1_to_hex(parent->tree->object.sha1), 194 cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex,
207 sha1_to_hex(commit->tree->object.sha1)); 195 sha1_to_hex(p->item->object.sha1), NULL);
208 html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); 196 html(")</td></tr>");
209 html("'>diff</a>)</td></tr>");
210 } 197 }
211 if (cgit_repo->snapshots) { 198 if (cgit_repo->snapshots) {
212 htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); 199 htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
213 filename = fmt("%s-%s.zip", cgit_query_repo, hex); 200 filename = fmt("%s-%s.zip", cgit_query_repo, hex);
214 html_attr(cgit_pageurl(cgit_query_repo, "snapshot", 201 html_attr(cgit_pageurl(cgit_query_repo, "snapshot",
215 fmt("id=%s&amp;name=%s", hex, filename))); 202 fmt("id=%s&amp;name=%s", hex, filename)));
@@ -230,13 +217,12 @@ void cgit_print_commit(const char *hex)
230 for(i = 0; i<files; i++) 217 for(i = 0; i<files; i++)
231 print_fileinfo(&items[i]); 218 print_fileinfo(&items[i]);
232 html("</table>"); 219 html("</table>");
233 html("<div class='diffstat-summary'>"); 220 html("<div class='diffstat-summary'>");
234 htmlf("%d files changed, %d insertions, %d deletions (", 221 htmlf("%d files changed, %d insertions, %d deletions (",
235 files, total_adds, total_rems); 222 files, total_adds, total_rems);
236 query = fmt("h=%s", hex); 223 cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex,
237 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL); 224 NULL, NULL);
238 html("show diff</a>)"); 225 html(")</div>");
239 html("</div>");
240 } 226 }
241 cgit_free_commitinfo(info); 227 cgit_free_commitinfo(info);
242} 228}
diff --git a/ui-diff.c b/ui-diff.c
index 5c864d9..a76a234 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -86,57 +86,55 @@ static void filepair_cb(struct diff_filepair *pair)
86 return; 86 return;
87 } 87 }
88 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) 88 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
89 cgit_print_error("Error running diff"); 89 cgit_print_error("Error running diff");
90} 90}
91 91
92void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path) 92void cgit_print_diff(const char *new_rev, const char *old_rev)
93{ 93{
94 unsigned char sha1[20], sha2[20]; 94 unsigned char sha1[20], sha2[20];
95 enum object_type type; 95 enum object_type type;
96 unsigned long size; 96 unsigned long size;
97 struct commit *commit; 97 struct commit *commit, *commit2;
98 98
99 html("<table class='diff'>"); 99 if (!new_rev)
100 html("<tr><td>"); 100 new_rev = cgit_query_head;
101 101 get_sha1(new_rev, sha1);
102 if (head && !old_hex && !new_hex) { 102 type = sha1_object_info(sha1, &size);
103 get_sha1(head, sha1); 103 if (type == OBJ_BAD) {
104 commit = lookup_commit_reference(sha1); 104 cgit_print_error(fmt("Bad object name: %s", new_rev));
105 if (commit && !parse_commit(commit)) 105 return;
106 cgit_diff_commit(commit, filepair_cb); 106 }
107 else 107 if (type != OBJ_COMMIT) {
108 cgit_print_error(fmt("Bad commit: %s", head)); 108 cgit_print_error(fmt("Unhandled object type: %s",
109 html("</td></tr>"); 109 typename(type)));
110 html("</table>");
111 return; 110 return;
112 } 111 }
113 112
114 get_sha1(old_hex, sha1); 113 commit = lookup_commit_reference(sha1);
115 get_sha1(new_hex, sha2); 114 if (!commit || parse_commit(commit))
115 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1)));
116 116
117 type = sha1_object_info(sha1, &size); 117 if (old_rev)
118 if (type == OBJ_BAD) { 118 get_sha1(old_rev, sha2);
119 else if (commit->parents && commit->parents->item)
120 hashcpy(sha2, commit->parents->item->object.sha1);
121 else
122 hashclr(sha2);
123
124 if (!is_null_sha1(sha2)) {
119 type = sha1_object_info(sha2, &size); 125 type = sha1_object_info(sha2, &size);
120 if (type == OBJ_BAD) { 126 if (type == OBJ_BAD) {
121 cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); 127 cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2)));
122 return; 128 return;
123 } 129 }
130 commit2 = lookup_commit_reference(sha2);
131 if (!commit2 || parse_commit(commit2))
132 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2)));
124 } 133 }
125 134
126 switch(type) { 135 html("<table class='diff'>");
127 case OBJ_BLOB: 136 html("<tr><td>");
128 header(sha1, path, 0644, sha2, path, 0644); 137 cgit_diff_tree(sha2, sha1, filepair_cb);
129 if (cgit_diff_files(sha1, sha2, print_line))
130 cgit_print_error("Error running diff");
131 break;
132 case OBJ_TREE:
133 cgit_diff_tree(sha1, sha2, filepair_cb);
134 break;
135 default:
136 cgit_print_error(fmt("Unhandled object type: %s",
137 typename(type)));
138 break;
139 }
140 html("</td></tr>"); 138 html("</td></tr>");
141 html("</table>"); 139 html("</table>");
142} 140}
diff --git a/ui-shared.c b/ui-shared.c
index 71c899a..15d8254 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -173,12 +173,34 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
173 name[cgit_max_msg_len - 2] = '.'; 173 name[cgit_max_msg_len - 2] = '.';
174 name[cgit_max_msg_len - 3] = '.'; 174 name[cgit_max_msg_len - 3] = '.';
175 } 175 }
176 reporevlink("commit", name, title, class, head, rev, NULL); 176 reporevlink("commit", name, title, class, head, rev, NULL);
177} 177}
178 178
179void cgit_diff_link(char *name, char *title, char *class, char *head,
180 char *new_rev, char *old_rev, char *path)
181{
182 char *delim;
183
184 delim = repolink(title, class, "diff", head, path);
185 if (new_rev && strcmp(new_rev, cgit_query_head)) {
186 html(delim);
187 html("id=");
188 html_attr(new_rev);
189 delim = "&amp;";
190 }
191 if (old_rev) {
192 html(delim);
193 html("id2=");
194 html_attr(old_rev);
195 }
196 html("'>");
197 html_txt(name);
198 html("</a>");
199}
200
179void cgit_print_date(time_t secs, char *format) 201void cgit_print_date(time_t secs, char *format)
180{ 202{
181 char buf[64]; 203 char buf[64];
182 struct tm *time; 204 struct tm *time;
183 205
184 time = gmtime(&secs); 206 time = gmtime(&secs);