-rw-r--r-- | ui-shared.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ui-shared.c b/ui-shared.c index 224e5f3..9319881 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -344,63 +344,65 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
344 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { | 344 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { |
345 | html(delim); | 345 | html(delim); |
346 | html("id="); | 346 | html("id="); |
347 | html_url_arg(new_rev); | 347 | html_url_arg(new_rev); |
348 | delim = "&"; | 348 | delim = "&"; |
349 | } | 349 | } |
350 | if (old_rev) { | 350 | if (old_rev) { |
351 | html(delim); | 351 | html(delim); |
352 | html("id2="); | 352 | html("id2="); |
353 | html_url_arg(old_rev); | 353 | html_url_arg(old_rev); |
354 | } | 354 | } |
355 | html("'>"); | 355 | html("'>"); |
356 | html_txt(name); | 356 | html_txt(name); |
357 | html("</a>"); | 357 | html("</a>"); |
358 | } | 358 | } |
359 | 359 | ||
360 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 360 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
361 | char *rev) | 361 | char *rev) |
362 | { | 362 | { |
363 | reporevlink("patch", name, title, class, head, rev, NULL); | 363 | reporevlink("patch", name, title, class, head, rev, NULL); |
364 | } | 364 | } |
365 | 365 | ||
366 | void cgit_object_link(struct object *obj) | 366 | void cgit_object_link(struct object *obj) |
367 | { | 367 | { |
368 | char *page, *rev, *name; | 368 | char *page, *shortrev, *fullrev, *name; |
369 | 369 | ||
370 | fullrev = sha1_to_hex(obj->sha1); | ||
371 | shortrev = xstrdup(fullrev); | ||
372 | shortrev[10] = '\0'; | ||
370 | if (obj->type == OBJ_COMMIT) { | 373 | if (obj->type == OBJ_COMMIT) { |
371 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, | 374 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, |
372 | ctx.qry.head, sha1_to_hex(obj->sha1)); | 375 | ctx.qry.head, fullrev); |
373 | return; | 376 | return; |
374 | } else if (obj->type == OBJ_TREE) | 377 | } else if (obj->type == OBJ_TREE) |
375 | page = "tree"; | 378 | page = "tree"; |
376 | else if (obj->type == OBJ_TAG) | 379 | else if (obj->type == OBJ_TAG) |
377 | page = "tag"; | 380 | page = "tag"; |
378 | else | 381 | else |
379 | page = "blob"; | 382 | page = "blob"; |
380 | rev = sha1_to_hex(obj->sha1); | 383 | name = fmt("%s %s...", typename(obj->type), shortrev); |
381 | name = fmt("%s %s", typename(obj->type), rev); | 384 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); |
382 | reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL); | ||
383 | } | 385 | } |
384 | 386 | ||
385 | void cgit_print_date(time_t secs, char *format, int local_time) | 387 | void cgit_print_date(time_t secs, char *format, int local_time) |
386 | { | 388 | { |
387 | char buf[64]; | 389 | char buf[64]; |
388 | struct tm *time; | 390 | struct tm *time; |
389 | 391 | ||
390 | if (!secs) | 392 | if (!secs) |
391 | return; | 393 | return; |
392 | if(local_time) | 394 | if(local_time) |
393 | time = localtime(&secs); | 395 | time = localtime(&secs); |
394 | else | 396 | else |
395 | time = gmtime(&secs); | 397 | time = gmtime(&secs); |
396 | strftime(buf, sizeof(buf)-1, format, time); | 398 | strftime(buf, sizeof(buf)-1, format, time); |
397 | html_txt(buf); | 399 | html_txt(buf); |
398 | } | 400 | } |
399 | 401 | ||
400 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 402 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
401 | { | 403 | { |
402 | time_t now, secs; | 404 | time_t now, secs; |
403 | 405 | ||
404 | if (!t) | 406 | if (!t) |
405 | return; | 407 | return; |
406 | time(&now); | 408 | time(&now); |
@@ -686,29 +688,28 @@ void cgit_print_filemode(unsigned short mode) | |||
686 | if (S_ISDIR(mode)) | 688 | if (S_ISDIR(mode)) |
687 | html("d"); | 689 | html("d"); |
688 | else if (S_ISLNK(mode)) | 690 | else if (S_ISLNK(mode)) |
689 | html("l"); | 691 | html("l"); |
690 | else if (S_ISGITLINK(mode)) | 692 | else if (S_ISGITLINK(mode)) |
691 | html("m"); | 693 | html("m"); |
692 | else | 694 | else |
693 | html("-"); | 695 | html("-"); |
694 | html_fileperm(mode >> 6); | 696 | html_fileperm(mode >> 6); |
695 | html_fileperm(mode >> 3); | 697 | html_fileperm(mode >> 3); |
696 | html_fileperm(mode); | 698 | html_fileperm(mode); |
697 | } | 699 | } |
698 | 700 | ||
699 | void cgit_print_snapshot_links(const char *repo, const char *head, | 701 | void cgit_print_snapshot_links(const char *repo, const char *head, |
700 | const char *hex, int snapshots) | 702 | const char *hex, int snapshots) |
701 | { | 703 | { |
702 | const struct cgit_snapshot_format* f; | 704 | const struct cgit_snapshot_format* f; |
703 | char *filename; | 705 | char *filename; |
704 | 706 | ||
705 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 707 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
706 | if (!(snapshots & f->bit)) | 708 | if (!(snapshots & f->bit)) |
707 | continue; | 709 | continue; |
708 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, | 710 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, |
709 | f->suffix); | 711 | f->suffix); |
710 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, | 712 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); |
711 | (char *)hex, filename); | ||
712 | html("<br/>"); | 713 | html("<br/>"); |
713 | } | 714 | } |
714 | } | 715 | } |