", 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, 0);
show_commit_decorations(commit);
html("| ");
html_txt(info->author);
- if (ctx.repo->enable_log_filecount) {
+
+ if (revs->graph) {
+ html(" | ");
+ 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);
- html(" | ");
- htmlf("%d", files);
- if (ctx.repo->enable_log_linecount) {
- html(" | ");
- htmlf("-%d/+%d", rem_lines, add_lines);
- }
}
+
+ if (ctx.repo->enable_log_filecount)
+ htmlf(" | %d", files);
+ if (ctx.repo->enable_log_linecount)
+ htmlf(" | -%d/+%d", rem_lines, add_lines);
+
html(" | \n");
if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
- struct strbuf msgbuf = STRBUF_INIT;
- html(" | "); /* Empty 'Age' column */
+ html("
");
if (ctx.qry.showmsg) {
/* Concatenate commit message + notes in msgbuf */
@@ -165,9 +198,8 @@ void print_commit(struct commit *commit, struct rev_info *revs)
strbuf_addstr(&msgbuf, info->msg);
strbuf_addch(&msgbuf, '\n');
}
- format_note(NULL, commit->object.sha1, &msgbuf,
- PAGE_ENCODING,
- NOTES_SHOW_HEADER | NOTES_INDENT);
+ format_display_notes(commit->object.sha1,
+ &msgbuf, PAGE_ENCODING, 0);
strbuf_addch(&msgbuf, '\n');
strbuf_ltrim(&msgbuf);
}
@@ -198,28 +230,34 @@ void print_commit(struct commit *commit, struct rev_info *revs)
}
html("\n");
}
+ else
+ html(" | "); /* Empty 'Age' column */
/* Print msgbuf into remainder of table row */
- htmlf("\n", cols,
+ htmlf(" | \n", columns - (revs->graph ? 1 : 0),
ctx.qry.showmsg ? " class='logmsg'" : "");
html_txt(msgbuf.buf);
html(" |
\n");
- strbuf_release(&msgbuf);
}
+ strbuf_release(&msgbuf);
strbuf_release(&graphbuf);
cgit_free_commitinfo(info);
}
-static const char *disambiguate_ref(const char *ref)
+static const char *disambiguate_ref(const char *ref, int *must_free_result)
{
unsigned char sha1[20];
- const char *longref;
+ struct strbuf longref = STRBUF_INIT;
- longref = fmt("refs/heads/%s", ref);
- if (get_sha1(longref, sha1) == 0)
- return longref;
+ 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;
}
@@ -246,30 +284,32 @@ static char *next_token(char **src)
}
void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
- char *path, int pager)
+ char *path, int pager, int commit_graph, int commit_sort)
{
struct rev_info rev;
struct commit *commit;
struct vector vec = VECTOR_INIT(char *);
- int i, columns = 3;
- char *arg;
+ int i, columns = commit_graph ? 4 : 3;
+ int must_free_tip = 0;
+ struct strbuf argbuf = STRBUF_INIT;
/* First argv is NULL */
vector_push(&vec, NULL, 0);
if (!tip)
tip = ctx.qry.head;
- tip = disambiguate_ref(tip);
+ tip = disambiguate_ref(tip, &must_free_tip);
vector_push(&vec, &tip, 0);
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);
+ strbuf_addf(&argbuf, "--%s=%s", grep, pattern);
+ vector_push(&vec, &argbuf.buf, 0);
}
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
@@ -286,7 +326,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
}
}
}
- if (ctx.repo->enable_commit_graph) {
+ if (commit_graph) {
static const char *graph_arg = "--graph";
static const char *color_arg = "--color";
vector_push(&vec, &graph_arg, 0);
@@ -295,9 +335,17 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
COLUMN_COLORS_HTML_MAX);
}
+ if (commit_sort == 1) {
+ static const char *date_order_arg = "--date-order";
+ vector_push(&vec, &date_order_arg, 0);
+ } else if (commit_sort == 2) {
+ static const char *topo_order_arg = "--topo-order";
+ vector_push(&vec, &topo_order_arg, 0);
+ }
+
if (path) {
- arg = "--";
- vector_push(&vec, &arg, 0);
+ static const char *double_dash_arg = "--";
+ vector_push(&vec, &double_dash_arg, 0);
vector_push(&vec, &path, 0);
}
@@ -320,9 +368,11 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
if (pager)
html("");
- html("| Age | ");
- if (ctx.repo->enable_commit_graph)
+ html("
|---|
");
+ if (commit_graph)
html(" | ");
+ else
+ html("Age | ");
html("Commit message");
if (pager) {
html(" (");
@@ -333,13 +383,15 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
html(")");
}
html(" | Author | ");
+ if (commit_graph)
+ html("Age | ");
if (ctx.repo->enable_log_filecount) {
html("Files | ");
columns++;
- if (ctx.repo->enable_log_linecount) {
- html("Lines | ");
- columns++;
- }
+ }
+ if (ctx.repo->enable_log_linecount) {
+ html("Lines | ");
+ columns++;
}
html("
\n");
@@ -361,25 +413,33 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
commit->parents = NULL;
}
if (pager) {
- html("
");
+ html("");
} else if ((commit = get_revision(&rev)) != NULL) {
- html("| ");
+ htmlf(" |
| ", columns);
cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
html(" |
\n");
}
+
+ /* If we allocated tip then it is safe to cast away const. */
+ if (must_free_tip)
+ free((char*) tip);
+ strbuf_release(&argbuf);
}