From 148fb9622c6a96021e572d1a372e38896506031f Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sat, 16 Dec 2006 00:33:28 +0100 Subject: Move cgit_print_date into ui-shared, reuse in ui-summary Signed-off-by: Lars Hjemli --- cgit.h | 1 + ui-commit.c | 11 ----------- ui-shared.c | 12 ++++++++++++ ui-summary.c | 20 +++++++++++--------- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/cgit.h b/cgit.h index a905e47..a54f2b5 100644 --- a/cgit.h +++ b/cgit.h @@ -85,6 +85,7 @@ extern char *cgit_pageurl(const char *reponame, const char *pagename, const char *query); extern void cgit_print_error(char *msg); +extern void cgit_print_date(unsigned long secs); extern void cgit_print_docstart(char *title, struct cacheitem *item); extern void cgit_print_docend(); extern void cgit_print_pageheader(char *title); diff --git a/ui-commit.c b/ui-commit.c index 1c0e7e5..2d38f0b 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -1,16 +1,5 @@ #include "cgit.h" -void cgit_print_date(unsigned long secs) -{ - char buf[32]; - struct tm *time; - - time = gmtime(&secs); - strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); - html_txt(buf); - -} - void cgit_print_commit(const char *hex) { struct commit *commit; diff --git a/ui-shared.c b/ui-shared.c index cb8a8df..1a6c127 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -60,6 +60,18 @@ char *cgit_pageurl(const char *reponame, const char *pagename, } } + +void cgit_print_date(unsigned long secs) +{ + char buf[32]; + struct tm *time; + + time = gmtime(&secs); + strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); + html_txt(buf); + +} + void cgit_print_docstart(char *title, struct cacheitem *item) { html("Content-Type: text/html; charset=utf-8\n"); diff --git a/ui-summary.c b/ui-summary.c index 46814dd..8ff3642 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -12,10 +12,12 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { struct commit *commit; + struct commitinfo *info; char buf[256], *url; commit = lookup_commit(sha1); if (commit && !parse_commit(commit)){ + info = cgit_parse_commit(commit); html(""); url = cgit_pageurl(cgit_query_repo, "log", fmt("h=%s", refname)); @@ -24,14 +26,14 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, html_txt(buf); html_link_close(); html(""); - pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf, - sizeof(buf), 0, NULL, NULL, 0); - html_txt(buf); - html("tree"); + cgit_print_date(commit->date); + html(""); + url = cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(sha1))); + html_link_open(url, NULL, NULL); + html_txt(info->subject); + html_link_close(); + html(""); + html_txt(info->author); html("\n"); } else { html(""); @@ -46,7 +48,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, static void cgit_print_branches() { html(""); - html("\n"); + html("\n"); for_each_branch_ref(cgit_print_branch_cb, NULL); html("
BranchLast commitLink
BranchUpdatedCommit subjectAuthor
"); } -- cgit v1.2.1