mirror of
https://git.zx2c4.com/cgit
synced 2024-11-26 02:18:42 +00:00
c422b9b3d5
When clicking on "log" from a tag we end up showing the log of whatever branch we used to reach the tag. If the tag doesn't point onto a branch then the tagged commit won't appear in this output. By linking to tags with the head parameter instead of the "id" parameter the log link will show the log of the tag. This is clearly desirable when the tag has been reached from the refs UI and changing the behaviour for tag decorations makes them match branch decorations where log -> decoration -> log shows the log of the decoration. Reported-by: Ferry Huberts <mailings@hupie.com> Signed-off-by: John Keeping <john@keeping.me.uk>
432 lines
11 KiB
C
432 lines
11 KiB
C
/* ui-log.c: functions for log output
|
|
*
|
|
* Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
|
|
*
|
|
* Licensed under GNU General Public License v2
|
|
* (see COPYING for full license text)
|
|
*/
|
|
|
|
#include "cgit.h"
|
|
#include "ui-log.h"
|
|
#include "html.h"
|
|
#include "ui-shared.h"
|
|
#include "argv-array.h"
|
|
|
|
int files, add_lines, rem_lines;
|
|
|
|
/*
|
|
* The list of available column colors in the commit graph.
|
|
*/
|
|
static const char *column_colors_html[] = {
|
|
"<span class='column1'>",
|
|
"<span class='column2'>",
|
|
"<span class='column3'>",
|
|
"<span class='column4'>",
|
|
"<span class='column5'>",
|
|
"<span class='column6'>",
|
|
"</span>",
|
|
};
|
|
|
|
#define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
|
|
|
|
static void count_lines(char *line, int size)
|
|
{
|
|
if (size <= 0)
|
|
return;
|
|
|
|
if (line[0] == '+')
|
|
add_lines++;
|
|
|
|
else if (line[0] == '-')
|
|
rem_lines++;
|
|
}
|
|
|
|
static 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)
|
|
{
|
|
const struct name_decoration *deco;
|
|
static char buf[1024];
|
|
|
|
buf[sizeof(buf) - 1] = 0;
|
|
deco = get_name_decoration(&commit->object);
|
|
html("<span class='decoration'>");
|
|
while (deco) {
|
|
if (starts_with(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 (starts_with(deco->name, "tag: refs/tags/")) {
|
|
strncpy(buf, deco->name + 15, sizeof(buf) - 1);
|
|
cgit_tag_link(buf, NULL, "tag-deco", buf);
|
|
}
|
|
else if (starts_with(deco->name, "refs/tags/")) {
|
|
strncpy(buf, deco->name + 10, sizeof(buf) - 1);
|
|
cgit_tag_link(buf, NULL, "tag-deco", buf);
|
|
}
|
|
else if (starts_with(deco->name, "refs/remotes/")) {
|
|
if (!ctx.repo->enable_remote_branches)
|
|
goto next;
|
|
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);
|
|
}
|
|
next:
|
|
deco = deco->next;
|
|
}
|
|
html("</span>");
|
|
}
|
|
|
|
static void print_commit(struct commit *commit, struct rev_info *revs)
|
|
{
|
|
struct commitinfo *info;
|
|
int columns = revs->graph ? 4 : 3;
|
|
struct strbuf graphbuf = STRBUF_INIT;
|
|
struct strbuf msgbuf = STRBUF_INIT;
|
|
|
|
if (ctx.repo->enable_log_filecount)
|
|
columns++;
|
|
if (ctx.repo->enable_log_linecount)
|
|
columns++;
|
|
|
|
if (revs->graph) {
|
|
/* Advance graph until current commit */
|
|
while (!graph_next_line(revs->graph, &graphbuf)) {
|
|
/* Print graph segment in otherwise empty table row */
|
|
html("<tr class='nohover'><td class='commitgraph'>");
|
|
html(graphbuf.buf);
|
|
htmlf("</td><td colspan='%d' /></tr>\n", columns);
|
|
strbuf_setlen(&graphbuf, 0);
|
|
}
|
|
/* Current commit's graph segment is now ready in graphbuf */
|
|
}
|
|
|
|
info = cgit_parse_commit(commit);
|
|
htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : "");
|
|
|
|
if (revs->graph) {
|
|
/* Print graph segment for current commit */
|
|
html("<td class='commitgraph'>");
|
|
html(graphbuf.buf);
|
|
html("</td>");
|
|
strbuf_setlen(&graphbuf, 0);
|
|
}
|
|
else {
|
|
html("<td>");
|
|
cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
|
|
html("</td>");
|
|
}
|
|
|
|
htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : "");
|
|
if (ctx.qry.showmsg) {
|
|
/* line-wrap long commit subjects instead of truncating them */
|
|
size_t subject_len = strlen(info->subject);
|
|
|
|
if (subject_len > ctx.cfg.max_msg_len &&
|
|
ctx.cfg.max_msg_len >= 15) {
|
|
/* symbol for signaling line-wrap (in PAGE_ENCODING) */
|
|
const char wrap_symbol[] = { ' ', 0xE2, 0x86, 0xB5, 0 };
|
|
int i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
|
|
|
|
/* Rewind i to preceding space character */
|
|
while (i > 0 && !isspace(info->subject[i]))
|
|
--i;
|
|
if (!i) /* Oops, zero spaces. Reset i */
|
|
i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
|
|
|
|
/* add remainder starting at i to msgbuf */
|
|
strbuf_add(&msgbuf, info->subject + i, subject_len - i);
|
|
strbuf_trim(&msgbuf);
|
|
strbuf_add(&msgbuf, "\n\n", 2);
|
|
|
|
/* Place wrap_symbol at position i in info->subject */
|
|
strcpy(info->subject + i, wrap_symbol);
|
|
}
|
|
}
|
|
cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
|
|
sha1_to_hex(commit->object.sha1), ctx.qry.vpath);
|
|
show_commit_decorations(commit);
|
|
html("</td><td>");
|
|
cgit_open_filter(ctx.repo->email_filter, info->author_email, "log");
|
|
html_txt(info->author);
|
|
cgit_close_filter(ctx.repo->email_filter);
|
|
|
|
if (revs->graph) {
|
|
html("</td><td>");
|
|
cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
|
|
}
|
|
|
|
if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) {
|
|
files = 0;
|
|
add_lines = 0;
|
|
rem_lines = 0;
|
|
cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
|
|
}
|
|
|
|
if (ctx.repo->enable_log_filecount)
|
|
htmlf("</td><td>%d", files);
|
|
if (ctx.repo->enable_log_linecount)
|
|
htmlf("</td><td>-%d/+%d", rem_lines, add_lines);
|
|
|
|
html("</td></tr>\n");
|
|
|
|
if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
|
|
html("<tr class='nohover'>");
|
|
|
|
if (ctx.qry.showmsg) {
|
|
/* Concatenate commit message + notes in msgbuf */
|
|
if (info->msg && *(info->msg)) {
|
|
strbuf_addstr(&msgbuf, info->msg);
|
|
strbuf_addch(&msgbuf, '\n');
|
|
}
|
|
format_display_notes(commit->object.sha1,
|
|
&msgbuf, PAGE_ENCODING, 0);
|
|
strbuf_addch(&msgbuf, '\n');
|
|
strbuf_ltrim(&msgbuf);
|
|
}
|
|
|
|
if (revs->graph) {
|
|
int lines = 0;
|
|
|
|
/* Calculate graph padding */
|
|
if (ctx.qry.showmsg) {
|
|
/* Count #lines in commit message + notes */
|
|
const char *p = msgbuf.buf;
|
|
lines = 1;
|
|
while ((p = strchr(p, '\n'))) {
|
|
p++;
|
|
lines++;
|
|
}
|
|
}
|
|
|
|
/* Print graph padding */
|
|
html("<td class='commitgraph'>");
|
|
while (lines > 0 || !graph_is_commit_finished(revs->graph)) {
|
|
if (graphbuf.len)
|
|
html("\n");
|
|
strbuf_setlen(&graphbuf, 0);
|
|
graph_next_line(revs->graph, &graphbuf);
|
|
html(graphbuf.buf);
|
|
lines--;
|
|
}
|
|
html("</td>\n");
|
|
}
|
|
else
|
|
html("<td/>"); /* Empty 'Age' column */
|
|
|
|
/* Print msgbuf into remainder of table row */
|
|
htmlf("<td colspan='%d'%s>\n", columns - (revs->graph ? 1 : 0),
|
|
ctx.qry.showmsg ? " class='logmsg'" : "");
|
|
html_txt(msgbuf.buf);
|
|
html("</td></tr>\n");
|
|
}
|
|
|
|
strbuf_release(&msgbuf);
|
|
strbuf_release(&graphbuf);
|
|
cgit_free_commitinfo(info);
|
|
}
|
|
|
|
static const char *disambiguate_ref(const char *ref, int *must_free_result)
|
|
{
|
|
unsigned char sha1[20];
|
|
struct strbuf longref = STRBUF_INIT;
|
|
|
|
strbuf_addf(&longref, "refs/heads/%s", ref);
|
|
if (get_sha1(longref.buf, sha1) == 0) {
|
|
*must_free_result = 1;
|
|
return strbuf_detach(&longref, NULL);
|
|
}
|
|
|
|
*must_free_result = 0;
|
|
strbuf_release(&longref);
|
|
return ref;
|
|
}
|
|
|
|
static char *next_token(char **src)
|
|
{
|
|
char *result;
|
|
|
|
if (!src || !*src)
|
|
return NULL;
|
|
while (isspace(**src))
|
|
(*src)++;
|
|
if (!**src)
|
|
return NULL;
|
|
result = *src;
|
|
while (**src) {
|
|
if (isspace(**src)) {
|
|
**src = '\0';
|
|
(*src)++;
|
|
break;
|
|
}
|
|
(*src)++;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
|
|
char *path, int pager, int commit_graph, int commit_sort)
|
|
{
|
|
struct rev_info rev;
|
|
struct commit *commit;
|
|
struct argv_array rev_argv = ARGV_ARRAY_INIT;
|
|
int i, columns = commit_graph ? 4 : 3;
|
|
int must_free_tip = 0;
|
|
|
|
/* rev_argv.argv[0] will be ignored by setup_revisions */
|
|
argv_array_push(&rev_argv, "log_rev_setup");
|
|
|
|
if (!tip)
|
|
tip = ctx.qry.head;
|
|
tip = disambiguate_ref(tip, &must_free_tip);
|
|
argv_array_push(&rev_argv, tip);
|
|
|
|
if (grep && pattern && *pattern) {
|
|
pattern = xstrdup(pattern);
|
|
if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
|
|
!strcmp(grep, "committer")) {
|
|
argv_array_pushf(&rev_argv, "--%s=%s", grep, pattern);
|
|
} else if (!strcmp(grep, "range")) {
|
|
char *arg;
|
|
/* Split the pattern at whitespace and add each token
|
|
* as a revision expression. Do not accept other
|
|
* rev-list options. Also, replace the previously
|
|
* pushed tip (it's no longer relevant).
|
|
*/
|
|
argv_array_pop(&rev_argv);
|
|
while ((arg = next_token(&pattern))) {
|
|
if (*arg == '-') {
|
|
fprintf(stderr, "Bad range expr: %s\n",
|
|
arg);
|
|
break;
|
|
}
|
|
argv_array_push(&rev_argv, arg);
|
|
}
|
|
}
|
|
}
|
|
if (commit_graph) {
|
|
argv_array_push(&rev_argv, "--graph");
|
|
argv_array_push(&rev_argv, "--color");
|
|
graph_set_column_colors(column_colors_html,
|
|
COLUMN_COLORS_HTML_MAX);
|
|
}
|
|
|
|
if (commit_sort == 1)
|
|
argv_array_push(&rev_argv, "--date-order");
|
|
else if (commit_sort == 2)
|
|
argv_array_push(&rev_argv, "--topo-order");
|
|
|
|
argv_array_push(&rev_argv, "--");
|
|
if (path)
|
|
argv_array_push(&rev_argv, path);
|
|
|
|
init_revisions(&rev, NULL);
|
|
rev.abbrev = DEFAULT_ABBREV;
|
|
rev.commit_format = CMIT_FMT_DEFAULT;
|
|
rev.verbose_header = 1;
|
|
rev.show_root_diff = 0;
|
|
rev.ignore_missing = 1;
|
|
setup_revisions(rev_argv.argc, rev_argv.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'>");
|
|
if (commit_graph)
|
|
html("<th></th>");
|
|
else
|
|
html("<th class='left'>Age</th>");
|
|
html("<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 (commit_graph)
|
|
html("<th class='left'>Age</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);
|
|
free_commit_list(commit->parents);
|
|
commit->parents = NULL;
|
|
}
|
|
|
|
for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
|
|
print_commit(commit, &rev);
|
|
free_commit_buffer(commit);
|
|
free_commit_list(commit->parents);
|
|
commit->parents = NULL;
|
|
}
|
|
if (pager) {
|
|
html("</table><ul class='pager'>");
|
|
if (ofs > 0) {
|
|
html("<li>");
|
|
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("</li>");
|
|
}
|
|
if ((commit = get_revision(&rev)) != NULL) {
|
|
html("<li>");
|
|
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("</li>");
|
|
}
|
|
html("</ul>");
|
|
} else if ((commit = get_revision(&rev)) != NULL) {
|
|
htmlf("<tr class='nohover'><td colspan='%d'>", columns);
|
|
cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
|
|
ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
|
|
html("</td></tr>\n");
|
|
}
|
|
|
|
/* If we allocated tip then it is safe to cast away const. */
|
|
if (must_free_tip)
|
|
free((char*) tip);
|
|
}
|