aboutsummaryrefslogtreecommitdiff
path: root/ui-log.c
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'ui-log.c')
-rw-r--r--ui-log.c266
1 files changed, 45 insertions, 221 deletions
diff --git a/ui-log.c b/ui-log.c
index 8add66a..b9771fa 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -9,25 +9,9 @@
#include "cgit.h"
#include "html.h"
#include "ui-shared.h"
-#include "vector.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)
-
void count_lines(char *line, int size)
{
if (size <= 0)
@@ -92,93 +76,27 @@ void show_commit_decorations(struct commit *commit)
}
}
-void print_commit(struct commit *commit, struct rev_info *revs)
+void print_commit(struct commit *commit)
{
struct commitinfo *info;
char *tmp;
- int cols = revs->graph ? 3 : 2;
- struct strbuf graphbuf = STRBUF_INIT;
- struct strbuf msgbuf = STRBUF_INIT;
-
- if (ctx.repo->enable_log_filecount) {
- cols++;
- if (ctx.repo->enable_log_linecount)
- cols++;
- }
-
- 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", cols);
- strbuf_setlen(&graphbuf, 0);
- }
- /* Current commit's graph segment is now ready in graphbuf */
- }
+ int cols = 2;
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>");
- 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();
- 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);
- }
- }
+ 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 (revs->graph) {
- html("</td><td>");
- 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();
- }
-
if (ctx.repo->enable_log_filecount) {
files = 0;
add_lines = 0;
@@ -192,61 +110,29 @@ void print_commit(struct commit *commit, struct rev_info *revs)
}
}
html("</td></tr>\n");
+ if (ctx.qry.showmsg) {
+ struct strbuf notes = STRBUF_INIT;
+ format_note(NULL, commit->object.sha1, &notes, PAGE_ENCODING, 0);
- 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_note(NULL, commit->object.sha1, &msgbuf,
- PAGE_ENCODING,
- NOTES_SHOW_HEADER | NOTES_INDENT);
- 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");
+ if (ctx.repo->enable_log_filecount) {
+ cols++;
+ if (ctx.repo->enable_log_linecount)
+ cols++;
}
- else
- html("<td/>"); /* Empty 'Age' column */
-
- /* Print msgbuf into remainder of table row */
- htmlf("<td colspan='%d'%s>\n", cols,
- ctx.qry.showmsg ? " class='logmsg'" : "");
- html_txt(msgbuf.buf);
+ 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(&notes);
}
-
- strbuf_release(&msgbuf);
- strbuf_release(&graphbuf);
cgit_free_commitinfo(info);
}
@@ -262,94 +148,38 @@ static const char *disambiguate_ref(const char *ref)
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)
+ char *path, int pager)
{
struct rev_info rev;
struct commit *commit;
- struct vector vec = VECTOR_INIT(char *);
+ const char *argv[] = {NULL, NULL, NULL, NULL, NULL};
+ int argc = 2;
int i, columns = 3;
- char *arg;
-
- /* First argv is NULL */
- vector_push(&vec, NULL, 0);
if (!tip)
tip = ctx.qry.head;
- tip = disambiguate_ref(tip);
- vector_push(&vec, &tip, 0);
+
+ argv[1] = disambiguate_ref(tip);
if (grep && pattern && *pattern) {
- pattern = xstrdup(pattern);
if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
- !strcmp(grep, "committer")) {
- arg = fmt("--%s=%s", grep, pattern);
- vector_push(&vec, &arg, 0);
- }
- if (!strcmp(grep, "range")) {
- /* 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).
- */
- vec.count--;
- while ((arg = next_token(&pattern))) {
- if (*arg == '-') {
- fprintf(stderr, "Bad range expr: %s\n",
- arg);
- break;
- }
- vector_push(&vec, &arg, 0);
- }
- }
- }
- if (commit_graph) {
- static const char *graph_arg = "--graph";
- static const char *color_arg = "--color";
- vector_push(&vec, &graph_arg, 0);
- vector_push(&vec, &color_arg, 0);
- graph_set_column_colors(column_colors_html,
- COLUMN_COLORS_HTML_MAX);
+ !strcmp(grep, "committer"))
+ argv[argc++] = fmt("--%s=%s", grep, pattern);
+ if (!strcmp(grep, "range"))
+ argv[1] = pattern;
}
if (path) {
- arg = "--";
- vector_push(&vec, &arg, 0);
- vector_push(&vec, &path, 0);
+ argv[argc++] = "--";
+ argv[argc++] = path;
}
-
- /* Make sure the vector is NULL-terminated */
- vector_push(&vec, NULL, 0);
- vec.count--;
-
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(vec.count, vec.data, &rev, NULL);
+ setup_revisions(argc, argv, &rev, NULL);
load_ref_decorations(DECORATE_FULL_REFS);
rev.show_decorations = 1;
rev.grep_filter.regflags |= REG_ICASE;
@@ -359,12 +189,8 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
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");
+ 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,
@@ -374,8 +200,6 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
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++;
@@ -397,7 +221,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
}
for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
- print_commit(commit, &rev);
+ print_commit(commit);
free(commit->buffer);
commit->buffer = NULL;
free_commit_list(commit->parents);
generated by cgitext v1.3.1+17 (git 2.54.0) at 2026-09-11 19:20:24 +0000