2006-12-11 16:04:19 +00:00
|
|
|
/* ui-log.c: functions for log output
|
|
|
|
*
|
|
|
|
* Copyright (C) 2006 Lars Hjemli
|
|
|
|
*
|
|
|
|
* Licensed under GNU General Public License v2
|
|
|
|
* (see COPYING for full license text)
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "cgit.h"
|
2008-02-23 21:45:33 +00:00
|
|
|
#include "html.h"
|
2008-03-24 15:50:57 +00:00
|
|
|
#include "ui-shared.h"
|
2006-12-11 16:04:19 +00:00
|
|
|
|
2007-11-05 23:35:12 +00:00
|
|
|
int files, add_lines, rem_lines;
|
2007-05-13 09:27:46 +00:00
|
|
|
|
2007-05-13 15:03:27 +00:00
|
|
|
void count_lines(char *line, int size)
|
|
|
|
{
|
2007-11-05 23:35:12 +00:00
|
|
|
if (size <= 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (line[0] == '+')
|
|
|
|
add_lines++;
|
|
|
|
|
|
|
|
else if (line[0] == '-')
|
|
|
|
rem_lines++;
|
2007-05-13 15:03:27 +00:00
|
|
|
}
|
|
|
|
|
2007-05-13 09:27:46 +00:00
|
|
|
void inspect_files(struct diff_filepair *pair)
|
|
|
|
{
|
2009-01-31 09:40:40 +00:00
|
|
|
unsigned long old_size = 0;
|
|
|
|
unsigned long new_size = 0;
|
|
|
|
int binary = 0;
|
|
|
|
|
2007-05-13 09:27:46 +00:00
|
|
|
files++;
|
2008-02-16 12:56:09 +00:00
|
|
|
if (ctx.repo->enable_log_linecount)
|
2009-01-31 09:40:40 +00:00
|
|
|
cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
|
2010-06-24 15:52:57 +00:00
|
|
|
&new_size, &binary, 0, ctx.qry.ignorews,
|
|
|
|
count_lines);
|
2007-05-13 09:27:46 +00:00
|
|
|
}
|
|
|
|
|
2009-01-11 11:16:18 +00:00
|
|
|
void show_commit_decorations(struct commit *commit)
|
|
|
|
{
|
|
|
|
struct name_decoration *deco;
|
|
|
|
static char buf[1024];
|
|
|
|
|
|
|
|
buf[sizeof(buf) - 1] = 0;
|
|
|
|
deco = lookup_decoration(&name_decoration, &commit->object);
|
|
|
|
while (deco) {
|
|
|
|
if (!prefixcmp(deco->name, "refs/heads/")) {
|
|
|
|
strncpy(buf, deco->name + 11, sizeof(buf) - 1);
|
2010-06-11 12:50:47 +00:00
|
|
|
cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
|
|
|
|
ctx.qry.vpath, 0, NULL, NULL,
|
|
|
|
ctx.qry.showmsg);
|
2009-01-11 11:16:18 +00:00
|
|
|
}
|
|
|
|
else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
|
|
|
|
strncpy(buf, deco->name + 15, sizeof(buf) - 1);
|
|
|
|
cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
|
|
|
|
}
|
2009-08-16 17:52:27 +00:00
|
|
|
else if (!prefixcmp(deco->name, "refs/tags/")) {
|
|
|
|
strncpy(buf, deco->name + 10, sizeof(buf) - 1);
|
|
|
|
cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
|
|
|
|
}
|
2009-01-11 11:16:18 +00:00
|
|
|
else if (!prefixcmp(deco->name, "refs/remotes/")) {
|
|
|
|
strncpy(buf, deco->name + 13, sizeof(buf) - 1);
|
|
|
|
cgit_log_link(buf, NULL, "remote-deco", NULL,
|
2010-06-11 12:50:47 +00:00
|
|
|
sha1_to_hex(commit->object.sha1),
|
|
|
|
ctx.qry.vpath, 0, NULL, NULL,
|
|
|
|
ctx.qry.showmsg);
|
2009-01-11 11:16:18 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
strncpy(buf, deco->name, sizeof(buf) - 1);
|
|
|
|
cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
|
2010-06-11 12:50:47 +00:00
|
|
|
sha1_to_hex(commit->object.sha1),
|
|
|
|
ctx.qry.vpath, 0);
|
2009-01-11 11:16:18 +00:00
|
|
|
}
|
|
|
|
deco = deco->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-12-15 17:17:36 +00:00
|
|
|
void print_commit(struct commit *commit)
|
2006-12-11 16:04:19 +00:00
|
|
|
{
|
2006-12-15 17:17:36 +00:00
|
|
|
struct commitinfo *info;
|
2008-04-14 20:23:48 +00:00
|
|
|
char *tmp;
|
2008-11-29 17:58:31 +00:00
|
|
|
int cols = 2;
|
2006-12-11 16:04:19 +00:00
|
|
|
|
2006-12-15 17:17:36 +00:00
|
|
|
info = cgit_parse_commit(commit);
|
2008-11-29 18:11:26 +00:00
|
|
|
htmlf("<tr%s><td>",
|
|
|
|
ctx.qry.showmsg ? " class='logheader'" : "");
|
2008-04-14 20:23:48 +00:00
|
|
|
tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
|
2010-06-11 12:50:47 +00:00
|
|
|
tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
|
2008-04-14 20:23:48 +00:00
|
|
|
html_link_open(tmp, NULL, NULL);
|
2007-05-22 21:15:36 +00:00
|
|
|
cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
|
2008-04-14 20:23:48 +00:00
|
|
|
html_link_close();
|
2008-11-29 18:11:26 +00:00
|
|
|
htmlf("</td><td%s>",
|
|
|
|
ctx.qry.showmsg ? " class='logsubject'" : "");
|
2008-02-16 10:53:40 +00:00
|
|
|
cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
|
2010-06-11 12:50:47 +00:00
|
|
|
sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
|
2009-01-11 11:16:18 +00:00
|
|
|
show_commit_decorations(commit);
|
2008-04-14 20:13:38 +00:00
|
|
|
html("</td><td>");
|
|
|
|
html_txt(info->author);
|
2008-02-16 12:56:09 +00:00
|
|
|
if (ctx.repo->enable_log_filecount) {
|
2007-05-18 11:55:52 +00:00
|
|
|
files = 0;
|
2007-11-05 23:35:12 +00:00
|
|
|
add_lines = 0;
|
|
|
|
rem_lines = 0;
|
2007-05-18 11:55:52 +00:00
|
|
|
cgit_diff_commit(commit, inspect_files);
|
2008-04-14 20:13:38 +00:00
|
|
|
html("</td><td>");
|
2007-05-18 11:55:52 +00:00
|
|
|
htmlf("%d", files);
|
2008-02-16 12:56:09 +00:00
|
|
|
if (ctx.repo->enable_log_linecount) {
|
2008-04-14 20:13:38 +00:00
|
|
|
html("</td><td>");
|
2007-11-05 23:35:12 +00:00
|
|
|
htmlf("-%d/+%d", rem_lines, add_lines);
|
2007-05-18 11:55:52 +00:00
|
|
|
}
|
|
|
|
}
|
2006-12-11 16:04:19 +00:00
|
|
|
html("</td></tr>\n");
|
2008-11-29 17:39:41 +00:00
|
|
|
if (ctx.qry.showmsg) {
|
2010-07-29 14:32:31 +00:00
|
|
|
struct strbuf notes = STRBUF_INIT;
|
2010-08-22 11:29:57 +00:00
|
|
|
format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0);
|
2010-07-29 14:32:31 +00:00
|
|
|
|
2008-11-29 17:39:41 +00:00
|
|
|
if (ctx.repo->enable_log_filecount) {
|
2008-11-29 17:58:31 +00:00
|
|
|
cols++;
|
2008-11-29 17:39:41 +00:00
|
|
|
if (ctx.repo->enable_log_linecount)
|
2008-11-29 17:58:31 +00:00
|
|
|
cols++;
|
2008-11-29 17:39:41 +00:00
|
|
|
}
|
2008-11-29 18:11:26 +00:00
|
|
|
htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
|
2008-11-29 17:58:31 +00:00
|
|
|
cols);
|
|
|
|
html_txt(info->msg);
|
2008-11-29 18:11:26 +00:00
|
|
|
html("</td></tr>\n");
|
2010-07-29 14:32:31 +00:00
|
|
|
if (notes.len != 0) {
|
|
|
|
html("<tr class='nohover'>");
|
|
|
|
html("<td class='lognotes-label'>Notes:</td>");
|
|
|
|
htmlf("<td colspan='%d' class='lognotes'>",
|
|
|
|
cols);
|
|
|
|
html_txt(notes.buf);
|
|
|
|
html("</td></tr>\n");
|
|
|
|
}
|
|
|
|
strbuf_release(¬es);
|
2008-11-29 17:39:41 +00:00
|
|
|
}
|
2006-12-16 13:58:20 +00:00
|
|
|
cgit_free_commitinfo(info);
|
2006-12-11 16:04:19 +00:00
|
|
|
}
|
|
|
|
|
2008-12-03 16:34:23 +00:00
|
|
|
static const char *disambiguate_ref(const char *ref)
|
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
|
|
|
const char *longref;
|
|
|
|
|
|
|
|
longref = fmt("refs/heads/%s", ref);
|
|
|
|
if (get_sha1(longref, sha1) == 0)
|
|
|
|
return longref;
|
|
|
|
|
|
|
|
return ref;
|
|
|
|
}
|
2006-12-15 17:17:36 +00:00
|
|
|
|
2008-04-14 20:13:38 +00:00
|
|
|
void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
|
|
|
|
char *path, int pager)
|
2006-12-11 16:04:19 +00:00
|
|
|
{
|
|
|
|
struct rev_info rev;
|
|
|
|
struct commit *commit;
|
2008-12-03 16:34:23 +00:00
|
|
|
const char *argv[] = {NULL, NULL, NULL, NULL, NULL};
|
2006-12-28 01:45:28 +00:00
|
|
|
int argc = 2;
|
2008-04-14 20:13:38 +00:00
|
|
|
int i, columns = 3;
|
2007-05-13 09:27:46 +00:00
|
|
|
|
2007-06-17 12:58:45 +00:00
|
|
|
if (!tip)
|
2008-12-03 16:34:23 +00:00
|
|
|
tip = ctx.qry.head;
|
|
|
|
|
|
|
|
argv[1] = disambiguate_ref(tip);
|
2007-06-17 12:58:45 +00:00
|
|
|
|
2010-06-19 12:32:37 +00:00
|
|
|
if (grep && pattern) {
|
|
|
|
if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
|
|
|
|
!strcmp(grep, "committer"))
|
|
|
|
argv[argc++] = fmt("--%s=%s", grep, pattern);
|
|
|
|
if (!strcmp(grep, "range"))
|
|
|
|
argv[1] = pattern;
|
|
|
|
}
|
2007-10-28 14:23:00 +00:00
|
|
|
|
2007-05-14 09:10:59 +00:00
|
|
|
if (path) {
|
|
|
|
argv[argc++] = "--";
|
|
|
|
argv[argc++] = path;
|
|
|
|
}
|
2006-12-11 16:04:19 +00:00
|
|
|
init_revisions(&rev, NULL);
|
|
|
|
rev.abbrev = DEFAULT_ABBREV;
|
|
|
|
rev.commit_format = CMIT_FMT_DEFAULT;
|
|
|
|
rev.verbose_header = 1;
|
|
|
|
rev.show_root_diff = 0;
|
2006-12-28 01:45:28 +00:00
|
|
|
setup_revisions(argc, argv, &rev, NULL);
|
2009-09-13 19:56:45 +00:00
|
|
|
load_ref_decorations(DECORATE_FULL_REFS);
|
2009-01-11 11:16:18 +00:00
|
|
|
rev.show_decorations = 1;
|
2008-10-05 17:19:59 +00:00
|
|
|
rev.grep_filter.regflags |= REG_ICASE;
|
|
|
|
compile_grep_patterns(&rev.grep_filter);
|
2006-12-11 16:04:19 +00:00
|
|
|
prepare_revision_walk(&rev);
|
|
|
|
|
2008-04-14 20:13:38 +00:00
|
|
|
if (pager)
|
|
|
|
html("<table class='list nowrap'>");
|
2007-05-18 11:55:52 +00:00
|
|
|
|
2008-04-14 20:13:38 +00:00
|
|
|
html("<tr class='nohover'><th class='left'>Age</th>"
|
2008-11-29 17:39:41 +00:00
|
|
|
"<th class='left'>Commit message");
|
|
|
|
if (pager) {
|
|
|
|
html(" (");
|
2009-01-09 22:35:10 +00:00
|
|
|
cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
|
|
|
|
NULL, ctx.qry.head, ctx.qry.sha1,
|
2010-06-11 12:50:47 +00:00
|
|
|
ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
|
2008-11-29 17:39:41 +00:00
|
|
|
ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
|
|
|
|
html(")");
|
|
|
|
}
|
|
|
|
html("</th><th class='left'>Author</th>");
|
2008-02-16 12:56:09 +00:00
|
|
|
if (ctx.repo->enable_log_filecount) {
|
2008-04-14 20:13:38 +00:00
|
|
|
html("<th class='left'>Files</th>");
|
|
|
|
columns++;
|
|
|
|
if (ctx.repo->enable_log_linecount) {
|
|
|
|
html("<th class='left'>Lines</th>");
|
|
|
|
columns++;
|
|
|
|
}
|
2007-05-18 11:55:52 +00:00
|
|
|
}
|
2008-04-14 20:13:38 +00:00
|
|
|
html("</tr>\n");
|
2006-12-13 23:40:34 +00:00
|
|
|
|
|
|
|
if (ofs<0)
|
|
|
|
ofs = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
|
|
|
|
free(commit->buffer);
|
|
|
|
commit->buffer = NULL;
|
|
|
|
free_commit_list(commit->parents);
|
|
|
|
commit->parents = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
|
2006-12-15 17:17:36 +00:00
|
|
|
print_commit(commit);
|
2006-12-11 16:04:19 +00:00
|
|
|
free(commit->buffer);
|
|
|
|
commit->buffer = NULL;
|
|
|
|
free_commit_list(commit->parents);
|
|
|
|
commit->parents = NULL;
|
|
|
|
}
|
2007-05-26 01:26:14 +00:00
|
|
|
if (pager) {
|
2010-09-04 15:30:18 +00:00
|
|
|
html("</table><div class='pager'>");
|
2007-05-26 01:26:14 +00:00
|
|
|
if (ofs > 0) {
|
2008-02-16 10:53:40 +00:00
|
|
|
cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
|
2010-06-11 12:50:47 +00:00
|
|
|
ctx.qry.sha1, ctx.qry.vpath,
|
2008-02-16 10:53:40 +00:00
|
|
|
ofs - cnt, ctx.qry.grep,
|
2008-11-29 17:39:41 +00:00
|
|
|
ctx.qry.search, ctx.qry.showmsg);
|
2007-06-29 18:27:41 +00:00
|
|
|
html(" ");
|
2007-05-26 01:26:14 +00:00
|
|
|
}
|
|
|
|
if ((commit = get_revision(&rev)) != NULL) {
|
2008-02-16 10:53:40 +00:00
|
|
|
cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
|
2010-06-11 12:50:47 +00:00
|
|
|
ctx.qry.sha1, ctx.qry.vpath,
|
2008-02-16 10:53:40 +00:00
|
|
|
ofs + cnt, ctx.qry.grep,
|
2008-11-29 17:39:41 +00:00
|
|
|
ctx.qry.search, ctx.qry.showmsg);
|
2007-05-26 01:26:14 +00:00
|
|
|
}
|
|
|
|
html("</div>");
|
2008-04-14 20:13:38 +00:00
|
|
|
} else if ((commit = get_revision(&rev)) != NULL) {
|
|
|
|
html("<tr class='nohover'><td colspan='3'>");
|
2010-06-11 12:50:47 +00:00
|
|
|
cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
|
|
|
|
ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
|
2008-04-14 20:13:38 +00:00
|
|
|
html("</td></tr>\n");
|
2006-12-13 23:40:34 +00:00
|
|
|
}
|
2006-12-11 16:04:19 +00:00
|
|
|
}
|