mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-08 09:38:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make branches, tags and log play better together in the summary view

Browse Source 
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2008-04-14 22:13:38 +02:00
parent 35d19bbb64
commit 5764fe9546
3 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ui-log.c
View File

@ -41,32 +41,33 @@ void print_commit(struct commit *commit)
html("</td><td>"); html("</td><td>");
cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
sha1_to_hex(commit->object.sha1)); sha1_to_hex(commit->object.sha1));
html("</td><td>");
html_txt(info->author);
if (ctx.repo->enable_log_filecount) { if (ctx.repo->enable_log_filecount) {
files = 0; files = 0;
add_lines = 0; add_lines = 0;
rem_lines = 0; rem_lines = 0;
cgit_diff_commit(commit, inspect_files); cgit_diff_commit(commit, inspect_files);
html("</td><td class='right'>"); html("</td><td>");
htmlf("%d", files); htmlf("%d", files);
if (ctx.repo->enable_log_linecount) { if (ctx.repo->enable_log_linecount) {
html("</td><td class='right'>"); html("</td><td>");
htmlf("-%d/+%d", rem_lines, add_lines); htmlf("-%d/+%d", rem_lines, add_lines);
} }
} }
html("</td><td>");
html_txt(info->author);
html("</td></tr>\n"); html("</td></tr>\n");
cgit_free_commitinfo(info); cgit_free_commitinfo(info);
} }
void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager) void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
char *path, int pager)
{ {
struct rev_info rev; struct rev_info rev;
struct commit *commit; struct commit *commit;
const char *argv[] = {NULL, tip, NULL, NULL, NULL}; const char *argv[] = {NULL, tip, NULL, NULL, NULL};
int argc = 2; int argc = 2;
int i; int i, columns = 3;
if (!tip) if (!tip)
argv[1] = ctx.qry.head; argv[1] = ctx.qry.head;
@ -92,16 +93,21 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
} }
prepare_revision_walk(&rev); prepare_revision_walk(&rev);
html("<table summary='log' class='list nowrap'>"); if (pager)
html("<tr class='nohover'><th class='left'>Age</th>" html("<table class='list nowrap'>");
"<th class='left'>Message</th>");
html("<tr class='nohover'><th class='left'>Age</th>"
"<th class='left'>Commit message</th>"
"<th class='left'>Author</th>");
if (ctx.repo->enable_log_filecount) { if (ctx.repo->enable_log_filecount) {
html("<th class='right'>Files</th>"); html("<th class='left'>Files</th>");
if (ctx.repo->enable_log_linecount) columns++;
html("<th class='right'>Lines</th>"); if (ctx.repo->enable_log_linecount) {
html("<th class='left'>Lines</th>");
columns++;
} }
html("<th class='left'>Author</th></tr>\n"); }
html("</tr>\n");
if (ofs<0) if (ofs<0)
ofs = 0; ofs = 0;
@ -120,10 +126,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
free_commit_list(commit->parents); free_commit_list(commit->parents);
commit->parents = NULL; commit->parents = NULL;
} }
html("</table>\n");
if (pager) { if (pager) {
html("<div class='pager'>"); htmlf("</table><div class='pager'>",
columns);
if (ofs > 0) { if (ofs > 0) {
cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
ctx.qry.sha1, ctx.qry.path, ctx.qry.sha1, ctx.qry.path,
@ -138,5 +143,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
ctx.qry.search); ctx.qry.search);
} }
html("</div>"); html("</div>");
} else if ((commit = get_revision(&rev)) != NULL) {
html("<tr class='nohover'><td colspan='3'>");
cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
NULL, NULL);
html("</td></tr>\n");
} }
} }

25
ui-refs.c
View File

@ -62,11 +62,11 @@ static int print_branch(struct refinfo *ref)
html("</td><td>"); html("</td><td>");
if (ref->object->type == OBJ_COMMIT) { if (ref->object->type == OBJ_COMMIT) {
cgit_print_age(info->commit->date, -1, NULL); cgit_commit_link(info->subject, NULL, NULL, name, NULL);
html("</td><td>"); html("</td><td>");
html_txt(info->author); html_txt(info->author);
html("</td><td>"); html("</td><td colspan='2'>");
cgit_commit_link(info->subject, NULL, NULL, name, NULL); cgit_print_age(info->commit->date, -1, NULL);
} else { } else {
html("</td><td></td><td>"); html("</td><td></td><td>");
cgit_object_link(ref->object); cgit_object_link(ref->object);
@ -78,9 +78,9 @@ static int print_branch(struct refinfo *ref)
static void print_tag_header() static void print_tag_header()
{ {
html("<tr class='nohover'><th class='left'>Tag</th>" html("<tr class='nohover'><th class='left'>Tag</th>"
"<th class='left'>Age</th>" "<th class='left'>Reference</th>"
"<th class='left'>Author</th>" "<th class='left'>Author</th>"
"<th class='left'>Reference</th></tr>\n"); "<th class='left' colspan='2'>Age</th></tr>\n");
header = 1; header = 1;
} }
@ -102,20 +102,20 @@ static int print_tag(struct refinfo *ref)
html_txt(name); html_txt(name);
html_link_close(); html_link_close();
html("</td><td>"); html("</td><td>");
if (info->tagger_date > 0) cgit_object_link(tag->tagged);
cgit_print_age(info->tagger_date, -1, NULL);
html("</td><td>"); html("</td><td>");
if (info->tagger) if (info->tagger)
html(info->tagger); html(info->tagger);
html("</td><td>"); html("</td><td colspan='2'>");
cgit_object_link(tag->tagged); if (info->tagger_date > 0)
cgit_print_age(info->tagger_date, -1, NULL);
html("</td></tr>\n"); html("</td></tr>\n");
} else { } else {
if (!header) if (!header)
print_tag_header(); print_tag_header();
html("<tr><td>"); html("<tr><td>");
html_txt(name); html_txt(name);
html("</td><td colspan='2'/><td>"); html("</td><td>");
cgit_object_link(ref->object); cgit_object_link(ref->object);
html("</td></tr>\n"); html("</td></tr>\n");
} }
@ -135,9 +135,9 @@ void cgit_print_branches(int maxcount)
int i; int i;
html("<tr class='nohover'><th class='left'>Branch</th>" html("<tr class='nohover'><th class='left'>Branch</th>"
"<th class='left'>Idle</th>" "<th class='left'>Commit message</th>"
"<th class='left'>Author</th>" "<th class='left'>Author</th>"
"<th class='left'>Head commit</th></tr>\n"); "<th class='left' colspan='2'>Age</th></tr>\n");
list.refs = NULL; list.refs = NULL;
list.alloc = list.count = 0; list.alloc = list.count = 0;
@ -196,6 +196,5 @@ void cgit_print_refs()
html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
cgit_print_tags(0); cgit_print_tags(0);
} }
html("</table>"); html("</table>");
} }

10
ui-summary.c
View File

@ -18,14 +18,14 @@ void cgit_print_summary()
html_include(ctx.repo->readme); html_include(ctx.repo->readme);
html("</div>"); html("</div>");
} }
if (ctx.cfg.summary_log > 0)
cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
NULL, NULL, 0);
html("<table summary='repository info' class='list nowrap'>"); html("<table summary='repository info' class='list nowrap'>");
if (ctx.cfg.summary_log > 0)
html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
cgit_print_branches(ctx.cfg.summary_branches); cgit_print_branches(ctx.cfg.summary_branches);
html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
cgit_print_tags(ctx.cfg.summary_tags); cgit_print_tags(ctx.cfg.summary_tags);
if (ctx.cfg.summary_log > 0) {
html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
NULL, NULL, 0);
}
html("</table>"); html("</table>");
} }