author | Lars Hjemli <hjemli@gmail.com> | 2007-10-28 14:40:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-10-28 14:41:58 (UTC) |
commit | fc5880fab8b9afc589aaadd1299c34a6ef2a3c2d (patch) (unidiff) | |
tree | a429f34b01fc1ce9a90d46b81915db5fa124f83b | |
parent | cbcdbcf2bff23113fe81df8f11fe7843b8ed637e (diff) | |
download | cgit-fc5880fab8b9afc589aaadd1299c34a6ef2a3c2d.zip cgit-fc5880fab8b9afc589aaadd1299c34a6ef2a3c2d.tar.gz cgit-fc5880fab8b9afc589aaadd1299c34a6ef2a3c2d.tar.bz2 |
Teach cgit_object_link() about tag objects
This makes random tag links more helpfull, e.g. when a branch head references
a tag object, link to the tag page.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index 45105dc..1418010 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -179,192 +179,195 @@ static void reporevlink(char *page, char *name, char *title, char *class, | |||
179 | delim = repolink(title, class, page, head, path); | 179 | delim = repolink(title, class, page, head, path); |
180 | if (rev && strcmp(rev, cgit_query_head)) { | 180 | if (rev && strcmp(rev, cgit_query_head)) { |
181 | html(delim); | 181 | html(delim); |
182 | html("id="); | 182 | html("id="); |
183 | html_attr(rev); | 183 | html_attr(rev); |
184 | } | 184 | } |
185 | html("'>"); | 185 | html("'>"); |
186 | html_txt(name); | 186 | html_txt(name); |
187 | html("</a>"); | 187 | html("</a>"); |
188 | } | 188 | } |
189 | 189 | ||
190 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 190 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
191 | char *rev, char *path) | 191 | char *rev, char *path) |
192 | { | 192 | { |
193 | reporevlink("tree", name, title, class, head, rev, path); | 193 | reporevlink("tree", name, title, class, head, rev, path); |
194 | } | 194 | } |
195 | 195 | ||
196 | void cgit_log_link(char *name, char *title, char *class, char *head, | 196 | void cgit_log_link(char *name, char *title, char *class, char *head, |
197 | char *rev, char *path, int ofs) | 197 | char *rev, char *path, int ofs) |
198 | { | 198 | { |
199 | char *delim; | 199 | char *delim; |
200 | 200 | ||
201 | delim = repolink(title, class, "log", head, path); | 201 | delim = repolink(title, class, "log", head, path); |
202 | if (rev && strcmp(rev, cgit_query_head)) { | 202 | if (rev && strcmp(rev, cgit_query_head)) { |
203 | html(delim); | 203 | html(delim); |
204 | html("id="); | 204 | html("id="); |
205 | html_attr(rev); | 205 | html_attr(rev); |
206 | delim = "&"; | 206 | delim = "&"; |
207 | } | 207 | } |
208 | if (ofs > 0) { | 208 | if (ofs > 0) { |
209 | html(delim); | 209 | html(delim); |
210 | html("ofs="); | 210 | html("ofs="); |
211 | htmlf("%d", ofs); | 211 | htmlf("%d", ofs); |
212 | } | 212 | } |
213 | html("'>"); | 213 | html("'>"); |
214 | html_txt(name); | 214 | html_txt(name); |
215 | html("</a>"); | 215 | html("</a>"); |
216 | } | 216 | } |
217 | 217 | ||
218 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 218 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
219 | char *rev) | 219 | char *rev) |
220 | { | 220 | { |
221 | if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) { | 221 | if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) { |
222 | name[cgit_max_msg_len] = '\0'; | 222 | name[cgit_max_msg_len] = '\0'; |
223 | name[cgit_max_msg_len - 1] = '.'; | 223 | name[cgit_max_msg_len - 1] = '.'; |
224 | name[cgit_max_msg_len - 2] = '.'; | 224 | name[cgit_max_msg_len - 2] = '.'; |
225 | name[cgit_max_msg_len - 3] = '.'; | 225 | name[cgit_max_msg_len - 3] = '.'; |
226 | } | 226 | } |
227 | reporevlink("commit", name, title, class, head, rev, NULL); | 227 | reporevlink("commit", name, title, class, head, rev, NULL); |
228 | } | 228 | } |
229 | 229 | ||
230 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 230 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
231 | char *rev, char *path) | 231 | char *rev, char *path) |
232 | { | 232 | { |
233 | reporevlink("refs", name, title, class, head, rev, path); | 233 | reporevlink("refs", name, title, class, head, rev, path); |
234 | } | 234 | } |
235 | 235 | ||
236 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 236 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
237 | char *rev, char *archivename) | 237 | char *rev, char *archivename) |
238 | { | 238 | { |
239 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 239 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
240 | } | 240 | } |
241 | 241 | ||
242 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 242 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
243 | char *new_rev, char *old_rev, char *path) | 243 | char *new_rev, char *old_rev, char *path) |
244 | { | 244 | { |
245 | char *delim; | 245 | char *delim; |
246 | 246 | ||
247 | delim = repolink(title, class, "diff", head, path); | 247 | delim = repolink(title, class, "diff", head, path); |
248 | if (new_rev && strcmp(new_rev, cgit_query_head)) { | 248 | if (new_rev && strcmp(new_rev, cgit_query_head)) { |
249 | html(delim); | 249 | html(delim); |
250 | html("id="); | 250 | html("id="); |
251 | html_attr(new_rev); | 251 | html_attr(new_rev); |
252 | delim = "&"; | 252 | delim = "&"; |
253 | } | 253 | } |
254 | if (old_rev) { | 254 | if (old_rev) { |
255 | html(delim); | 255 | html(delim); |
256 | html("id2="); | 256 | html("id2="); |
257 | html_attr(old_rev); | 257 | html_attr(old_rev); |
258 | } | 258 | } |
259 | html("'>"); | 259 | html("'>"); |
260 | html_txt(name); | 260 | html_txt(name); |
261 | html("</a>"); | 261 | html("</a>"); |
262 | } | 262 | } |
263 | 263 | ||
264 | void cgit_object_link(struct object *obj) | 264 | void cgit_object_link(struct object *obj) |
265 | { | 265 | { |
266 | char *page, *arg, *url; | 266 | char *page, *arg, *url; |
267 | 267 | ||
268 | if (obj->type == OBJ_COMMIT) { | 268 | if (obj->type == OBJ_COMMIT) { |
269 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, | 269 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, |
270 | cgit_query_head, sha1_to_hex(obj->sha1)); | 270 | cgit_query_head, sha1_to_hex(obj->sha1)); |
271 | return; | 271 | return; |
272 | } else if (obj->type == OBJ_TREE) { | 272 | } else if (obj->type == OBJ_TREE) { |
273 | page = "tree"; | 273 | page = "tree"; |
274 | arg = "id"; | 274 | arg = "id"; |
275 | } else if (obj->type == OBJ_TAG) { | ||
276 | page = "tag"; | ||
277 | arg = "id"; | ||
275 | } else { | 278 | } else { |
276 | page = "blob"; | 279 | page = "blob"; |
277 | arg = "id"; | 280 | arg = "id"; |
278 | } | 281 | } |
279 | 282 | ||
280 | url = cgit_pageurl(cgit_query_repo, page, | 283 | url = cgit_pageurl(cgit_query_repo, page, |
281 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); | 284 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); |
282 | html_link_open(url, NULL, NULL); | 285 | html_link_open(url, NULL, NULL); |
283 | htmlf("%s %s", typename(obj->type), | 286 | htmlf("%s %s", typename(obj->type), |
284 | sha1_to_hex(obj->sha1)); | 287 | sha1_to_hex(obj->sha1)); |
285 | html_link_close(); | 288 | html_link_close(); |
286 | } | 289 | } |
287 | 290 | ||
288 | void cgit_print_date(time_t secs, char *format) | 291 | void cgit_print_date(time_t secs, char *format) |
289 | { | 292 | { |
290 | char buf[64]; | 293 | char buf[64]; |
291 | struct tm *time; | 294 | struct tm *time; |
292 | 295 | ||
293 | time = gmtime(&secs); | 296 | time = gmtime(&secs); |
294 | strftime(buf, sizeof(buf)-1, format, time); | 297 | strftime(buf, sizeof(buf)-1, format, time); |
295 | html_txt(buf); | 298 | html_txt(buf); |
296 | } | 299 | } |
297 | 300 | ||
298 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 301 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
299 | { | 302 | { |
300 | time_t now, secs; | 303 | time_t now, secs; |
301 | 304 | ||
302 | time(&now); | 305 | time(&now); |
303 | secs = now - t; | 306 | secs = now - t; |
304 | 307 | ||
305 | if (secs > max_relative && max_relative >= 0) { | 308 | if (secs > max_relative && max_relative >= 0) { |
306 | cgit_print_date(t, format); | 309 | cgit_print_date(t, format); |
307 | return; | 310 | return; |
308 | } | 311 | } |
309 | 312 | ||
310 | if (secs < TM_HOUR * 2) { | 313 | if (secs < TM_HOUR * 2) { |
311 | htmlf("<span class='age-mins'>%.0f min.</span>", | 314 | htmlf("<span class='age-mins'>%.0f min.</span>", |
312 | secs * 1.0 / TM_MIN); | 315 | secs * 1.0 / TM_MIN); |
313 | return; | 316 | return; |
314 | } | 317 | } |
315 | if (secs < TM_DAY * 2) { | 318 | if (secs < TM_DAY * 2) { |
316 | htmlf("<span class='age-hours'>%.0f hours</span>", | 319 | htmlf("<span class='age-hours'>%.0f hours</span>", |
317 | secs * 1.0 / TM_HOUR); | 320 | secs * 1.0 / TM_HOUR); |
318 | return; | 321 | return; |
319 | } | 322 | } |
320 | if (secs < TM_WEEK * 2) { | 323 | if (secs < TM_WEEK * 2) { |
321 | htmlf("<span class='age-days'>%.0f days</span>", | 324 | htmlf("<span class='age-days'>%.0f days</span>", |
322 | secs * 1.0 / TM_DAY); | 325 | secs * 1.0 / TM_DAY); |
323 | return; | 326 | return; |
324 | } | 327 | } |
325 | if (secs < TM_MONTH * 2) { | 328 | if (secs < TM_MONTH * 2) { |
326 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 329 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
327 | secs * 1.0 / TM_WEEK); | 330 | secs * 1.0 / TM_WEEK); |
328 | return; | 331 | return; |
329 | } | 332 | } |
330 | if (secs < TM_YEAR * 2) { | 333 | if (secs < TM_YEAR * 2) { |
331 | htmlf("<span class='age-months'>%.0f months</span>", | 334 | htmlf("<span class='age-months'>%.0f months</span>", |
332 | secs * 1.0 / TM_MONTH); | 335 | secs * 1.0 / TM_MONTH); |
333 | return; | 336 | return; |
334 | } | 337 | } |
335 | htmlf("<span class='age-years'>%.0f years</span>", | 338 | htmlf("<span class='age-years'>%.0f years</span>", |
336 | secs * 1.0 / TM_YEAR); | 339 | secs * 1.0 / TM_YEAR); |
337 | } | 340 | } |
338 | 341 | ||
339 | void cgit_print_docstart(char *title, struct cacheitem *item) | 342 | void cgit_print_docstart(char *title, struct cacheitem *item) |
340 | { | 343 | { |
341 | html("Content-Type: text/html; charset=utf-8\n"); | 344 | html("Content-Type: text/html; charset=utf-8\n"); |
342 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 345 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
343 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 346 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
344 | ttl_seconds(item->ttl))); | 347 | ttl_seconds(item->ttl))); |
345 | html("\n"); | 348 | html("\n"); |
346 | html(cgit_doctype); | 349 | html(cgit_doctype); |
347 | html("<html>\n"); | 350 | html("<html>\n"); |
348 | html("<head>\n"); | 351 | html("<head>\n"); |
349 | html("<title>"); | 352 | html("<title>"); |
350 | html_txt(title); | 353 | html_txt(title); |
351 | html("</title>\n"); | 354 | html("</title>\n"); |
352 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 355 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
353 | html("<link rel='stylesheet' type='text/css' href='"); | 356 | html("<link rel='stylesheet' type='text/css' href='"); |
354 | html_attr(cgit_css); | 357 | html_attr(cgit_css); |
355 | html("'/>\n"); | 358 | html("'/>\n"); |
356 | html("</head>\n"); | 359 | html("</head>\n"); |
357 | html("<body>\n"); | 360 | html("<body>\n"); |
358 | } | 361 | } |
359 | 362 | ||
360 | void cgit_print_docend() | 363 | void cgit_print_docend() |
361 | { | 364 | { |
362 | html("</td></tr></table>"); | 365 | html("</td></tr></table>"); |
363 | html("</body>\n</html>\n"); | 366 | html("</body>\n</html>\n"); |
364 | } | 367 | } |
365 | 368 | ||
366 | void cgit_print_pageheader(char *title, int show_search) | 369 | void cgit_print_pageheader(char *title, int show_search) |
367 | { | 370 | { |
368 | html("<table id='layout'>"); | 371 | html("<table id='layout'>"); |
369 | html("<tr><td id='header'><a href='"); | 372 | html("<tr><td id='header'><a href='"); |
370 | html_attr(cgit_rooturl()); | 373 | html_attr(cgit_rooturl()); |