summaryrefslogtreecommitdiffabout
path: root/ui-commit.c
authorJustin Waters <justin.waters@timesys.com>2009-01-12 15:23:28 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-01-27 21:45:47 (UTC)
commit0027e38b40b8ef11dac6326a4e610728bae88247 (patch) (side-by-side diff)
tree808f1c8aff2dce84d5507a45602acdbf600360cd /ui-commit.c
parente78186dcb63ec67a38dddfcd8f91d2108583320b (diff)
downloadcgit-0027e38b40b8ef11dac6326a4e610728bae88247.zip
cgit-0027e38b40b8ef11dac6326a4e610728bae88247.tar.gz
cgit-0027e38b40b8ef11dac6326a4e610728bae88247.tar.bz2
Add decorations to commit pages
This adds the tag and branch head decorations to the commit pages. This is similar to how commits are displayed in the standard gitweb interface. Signed-off-by: Justin Waters <justin.waters@timesys.com>
Diffstat (limited to 'ui-commit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-commit.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ui-commit.c b/ui-commit.c
index a6a85a4..41ce70e 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,48 +1,51 @@
/* ui-commit.c: generate commit view
*
* Copyright (C) 2006 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
#include "html.h"
#include "ui-shared.h"
#include "ui-diff.h"
+#include "ui-log.h"
void cgit_print_commit(char *hex)
{
struct commit *commit, *parent;
struct commitinfo *info;
struct commit_list *p;
unsigned char sha1[20];
char *tmp;
int parents = 0;
if (!hex)
hex = ctx.qry.head;
if (get_sha1(hex, sha1)) {
cgit_print_error(fmt("Bad object id: %s", hex));
return;
}
commit = lookup_commit_reference(sha1);
if (!commit) {
cgit_print_error(fmt("Bad commit reference: %s", hex));
return;
}
info = cgit_parse_commit(commit);
+ load_ref_decorations();
+
html("<table summary='commit info' class='commit-info'>\n");
html("<tr><th>author</th><td>");
html_txt(info->author);
html(" ");
html_txt(info->author_email);
html("</td><td class='right'>");
cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
html("</td></tr>\n");
html("<tr><th>committer</th><td>");
html_txt(info->committer);
html(" ");
html_txt(info->committer_email);
@@ -78,24 +81,25 @@ void cgit_print_commit(char *hex)
html(")</td></tr>");
parents++;
}
if (ctx.repo->snapshots) {
html("<tr><th>download</th><td colspan='2' class='sha1'>");
cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
hex, ctx.repo->snapshots);
html("</td></tr>");
}
html("</table>\n");
html("<div class='commit-subject'>");
html_txt(info->subject);
+ show_commit_decorations(commit);
html("</div>");
html("<div class='commit-msg'>");
html_txt(info->msg);
html("</div>");
if (parents < 3) {
if (parents)
tmp = sha1_to_hex(commit->parents->item->object.sha1);
else
tmp = NULL;
cgit_print_diff(ctx.qry.sha1, tmp, NULL);
}
cgit_free_commitinfo(info);