mirror of
https://gitea.quitesimple.org/crtxcr/cgitsb
synced 2024-11-23 16:52:05 +01:00
1415f3f3e0
When using ui-log with path limits, the listing of commits enables parent rewriting in Git's internal log machinery. This did not work well together with cgit_diff_commit() which is used to generate the filecount and linecount numbers for each commit in the log view. cgit_diff_commit() would operate without any path limits, and would therefore process the full diff between the commits shown (which, because of parent rewriting, is not the same as processing the diff for the commit itself). Additionally, the bottom commit in the log view would (again, because of parent rewriting) have zero parents, causing us to process the entire diff between the empty tree and that commit. Since path limits were not in effect, this would (in large projects) reports thousands of files and millions of lines changed in that bottom commit. This patch fixes the issue by applying the same path limit to cgit_diff_commit() as is applied to the rest of the log view. The result is that the filecount/linecount now only reflects the diff as it pertains to the given path limit. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
253 lines
6.5 KiB
C
253 lines
6.5 KiB
C
/* 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"
|
|
#include "html.h"
|
|
#include "ui-shared.h"
|
|
|
|
int files, add_lines, rem_lines;
|
|
|
|
void count_lines(char *line, int size)
|
|
{
|
|
if (size <= 0)
|
|
return;
|
|
|
|
if (line[0] == '+')
|
|
add_lines++;
|
|
|
|
else if (line[0] == '-')
|
|
rem_lines++;
|
|
}
|
|
|
|
void inspect_files(struct diff_filepair *pair)
|
|
{
|
|
unsigned long old_size = 0;
|
|
unsigned long new_size = 0;
|
|
int binary = 0;
|
|
|
|
files++;
|
|
if (ctx.repo->enable_log_linecount)
|
|
cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
|
|
&new_size, &binary, 0, ctx.qry.ignorews,
|
|
count_lines);
|
|
}
|
|
|
|
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);
|
|
cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
|
|
ctx.qry.vpath, 0, NULL, NULL,
|
|
ctx.qry.showmsg);
|
|
}
|
|
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);
|
|
}
|
|
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);
|
|
}
|
|
else if (!prefixcmp(deco->name, "refs/remotes/")) {
|
|
strncpy(buf, deco->name + 13, sizeof(buf) - 1);
|
|
cgit_log_link(buf, NULL, "remote-deco", NULL,
|
|
sha1_to_hex(commit->object.sha1),
|
|
ctx.qry.vpath, 0, NULL, NULL,
|
|
ctx.qry.showmsg);
|
|
}
|
|
else {
|
|
strncpy(buf, deco->name, sizeof(buf) - 1);
|
|
cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
|
|
sha1_to_hex(commit->object.sha1),
|
|
ctx.qry.vpath, 0);
|
|
}
|
|
deco = deco->next;
|
|
}
|
|
}
|
|
|
|
void print_commit(struct commit *commit)
|
|
{
|
|
struct commitinfo *info;
|
|
char *tmp;
|
|
int cols = 2;
|
|
|
|
info = cgit_parse_commit(commit);
|
|
htmlf("<tr%s><td>",
|
|
ctx.qry.showmsg ? " class='logheader'" : "");
|
|
tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
|
|
tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
|
|
html_link_open(tmp, NULL, NULL);
|
|
cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
|
|
html_link_close();
|
|
htmlf("</td><td%s>",
|
|
ctx.qry.showmsg ? " class='logsubject'" : "");
|
|
cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
|
|
sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
|
|
show_commit_decorations(commit);
|
|
html("</td><td>");
|
|
html_txt(info->author);
|
|
if (ctx.repo->enable_log_filecount) {
|
|
files = 0;
|
|
add_lines = 0;
|
|
rem_lines = 0;
|
|
cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
|
|
html("</td><td>");
|
|
htmlf("%d", files);
|
|
if (ctx.repo->enable_log_linecount) {
|
|
html("</td><td>");
|
|
htmlf("-%d/+%d", rem_lines, add_lines);
|
|
}
|
|
}
|
|
html("</td></tr>\n");
|
|
if (ctx.qry.showmsg) {
|
|
struct strbuf notes = STRBUF_INIT;
|
|
format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0);
|
|
|
|
if (ctx.repo->enable_log_filecount) {
|
|
cols++;
|
|
if (ctx.repo->enable_log_linecount)
|
|
cols++;
|
|
}
|
|
htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
|
|
cols);
|
|
html_txt(info->msg);
|
|
html("</td></tr>\n");
|
|
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);
|
|
}
|
|
cgit_free_commitinfo(info);
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
|
|
char *path, int pager)
|
|
{
|
|
struct rev_info rev;
|
|
struct commit *commit;
|
|
const char *argv[] = {NULL, NULL, NULL, NULL, NULL};
|
|
int argc = 2;
|
|
int i, columns = 3;
|
|
|
|
if (!tip)
|
|
tip = ctx.qry.head;
|
|
|
|
argv[1] = disambiguate_ref(tip);
|
|
|
|
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;
|
|
}
|
|
|
|
if (path) {
|
|
argv[argc++] = "--";
|
|
argv[argc++] = path;
|
|
}
|
|
init_revisions(&rev, NULL);
|
|
rev.abbrev = DEFAULT_ABBREV;
|
|
rev.commit_format = CMIT_FMT_DEFAULT;
|
|
rev.verbose_header = 1;
|
|
rev.show_root_diff = 0;
|
|
setup_revisions(argc, argv, &rev, NULL);
|
|
load_ref_decorations(DECORATE_FULL_REFS);
|
|
rev.show_decorations = 1;
|
|
rev.grep_filter.regflags |= REG_ICASE;
|
|
compile_grep_patterns(&rev.grep_filter);
|
|
prepare_revision_walk(&rev);
|
|
|
|
if (pager)
|
|
html("<table class='list nowrap'>");
|
|
|
|
html("<tr class='nohover'><th class='left'>Age</th>"
|
|
"<th class='left'>Commit message");
|
|
if (pager) {
|
|
html(" (");
|
|
cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
|
|
NULL, ctx.qry.head, ctx.qry.sha1,
|
|
ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
|
|
ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
|
|
html(")");
|
|
}
|
|
html("</th><th class='left'>Author</th>");
|
|
if (ctx.repo->enable_log_filecount) {
|
|
html("<th class='left'>Files</th>");
|
|
columns++;
|
|
if (ctx.repo->enable_log_linecount) {
|
|
html("<th class='left'>Lines</th>");
|
|
columns++;
|
|
}
|
|
}
|
|
html("</tr>\n");
|
|
|
|
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++) {
|
|
print_commit(commit);
|
|
free(commit->buffer);
|
|
commit->buffer = NULL;
|
|
free_commit_list(commit->parents);
|
|
commit->parents = NULL;
|
|
}
|
|
if (pager) {
|
|
html("</table><div class='pager'>");
|
|
if (ofs > 0) {
|
|
cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
|
|
ctx.qry.sha1, ctx.qry.vpath,
|
|
ofs - cnt, ctx.qry.grep,
|
|
ctx.qry.search, ctx.qry.showmsg);
|
|
html(" ");
|
|
}
|
|
if ((commit = get_revision(&rev)) != NULL) {
|
|
cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
|
|
ctx.qry.sha1, ctx.qry.vpath,
|
|
ofs + cnt, ctx.qry.grep,
|
|
ctx.qry.search, ctx.qry.showmsg);
|
|
}
|
|
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,
|
|
ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
|
|
html("</td></tr>\n");
|
|
}
|
|
}
|