crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui-commit: Display git notes when present

Browse Source 
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Jeff Smith
2010-07-29 09:32:30 -05:00
committed by Lars Hjemli
parent f914317126
commit 059b39344f
3 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cgit.css
View File

@@ -326,6 +326,24 @@ div.commit-msg {
font-family: monospace; font-family: monospace;
} }
div.notes-header {
font-weight: bold;
padding-top: 1.5em;
}
div.notes {
white-space: pre;
font-family: monospace;
border: solid 1px #ee9;
background-color: #ffd;
padding: 0.3em 2em 0.3em 1em;
float: left;
}
div.notes-footer {
clear: left;
}
div.diffstat-header { div.diffstat-header {
font-weight: bold; font-weight: bold;
padding-top: 1.5em; padding-top: 1.5em;

1
cgit.h
View File

@@ -19,6 +19,7 @@
#include <xdiff-interface.h> #include <xdiff-interface.h>
#include <xdiff/xdiff.h> #include <xdiff/xdiff.h>
#include <utf8.h> #include <utf8.h>
#include <notes.h>
/* /*

15
ui-commit.c
View File

@@ -17,6 +17,7 @@ void cgit_print_commit(char *hex, const char *prefix)
struct commit *commit, *parent; struct commit *commit, *parent;
struct commitinfo *info, *parent_info; struct commitinfo *info, *parent_info;
struct commit_list *p; struct commit_list *p;
struct strbuf notes = STRBUF_INIT;
unsigned char sha1[20]; unsigned char sha1[20];
char *tmp, *tmp2; char *tmp, *tmp2;
int parents = 0; int parents = 0;
@@ -35,6 +36,8 @@ void cgit_print_commit(char *hex, const char *prefix)
} }
info = cgit_parse_commit(commit); info = cgit_parse_commit(commit);
get_commit_notes(commit, &notes, PAGE_ENCODING, 0);
load_ref_decorations(DECORATE_FULL_REFS); load_ref_decorations(DECORATE_FULL_REFS);
html("<table summary='commit info' class='commit-info'>\n"); html("<table summary='commit info' class='commit-info'>\n");
@@ -120,6 +123,17 @@ void cgit_print_commit(char *hex, const char *prefix)
if (ctx.repo->commit_filter) if (ctx.repo->commit_filter)
cgit_close_filter(ctx.repo->commit_filter); cgit_close_filter(ctx.repo->commit_filter);
html("</div>"); html("</div>");
if (notes.len != 0) {
html("<div class='notes-header'>Notes</div>");
html("<div class='notes'>");
if (ctx.repo->commit_filter)
cgit_open_filter(ctx.repo->commit_filter);
html_txt(notes.buf);
if (ctx.repo->commit_filter)
cgit_close_filter(ctx.repo->commit_filter);
html("</div>");
html("<div class='notes-footer'></div>");
}
if (parents < 3) { if (parents < 3) {
if (parents) if (parents)
tmp = sha1_to_hex(commit->parents->item->object.sha1); tmp = sha1_to_hex(commit->parents->item->object.sha1);
@@ -127,5 +141,6 @@ void cgit_print_commit(char *hex, const char *prefix)
tmp = NULL; tmp = NULL;
cgit_print_diff(ctx.qry.sha1, tmp, prefix); cgit_print_diff(ctx.qry.sha1, tmp, prefix);
} }
strbuf_release(&notes);
cgit_free_commitinfo(info); cgit_free_commitinfo(info);
} }