/* ui-log.c: functions for log output
*
- * Copyright (C) 2006 Lars Hjemli
+ * 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 "vector.h"
+#include "argv-array.h"
-int files, add_lines, rem_lines;
+static int files, add_lines, rem_lines, lines_counted;
/*
* The list of available column colors in the commit graph.
#define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
-void count_lines(char *line, int size)
+static void count_lines(char *line, int size)
{
if (size <= 0)
return;
rem_lines++;
}
-void inspect_files(struct diff_filepair *pair)
+static void inspect_files(struct diff_filepair *pair)
{
unsigned long old_size = 0;
unsigned long new_size = 0;
files++;
if (ctx.repo->enable_log_linecount)
- cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
+ cgit_diff_files(&pair->one->oid, &pair->two->oid, &old_size,
&new_size, &binary, 0, ctx.qry.ignorews,
count_lines);
}
void show_commit_decorations(struct commit *commit)
{
- struct name_decoration *deco;
+ const struct name_decoration *deco;
static char buf[1024];
buf[sizeof(buf) - 1] = 0;
- deco = lookup_decoration(&name_decoration, &commit->object);
+ deco = get_name_decoration(&commit->object);
+ if (!deco)
+ return;
+ html("<span class='decoration'>");
while (deco) {
- if (!prefixcmp(deco->name, "refs/heads/")) {
- strncpy(buf, deco->name + 11, sizeof(buf) - 1);
+ struct object_id peeled;
+ int is_annotated = 0;
+ strncpy(buf, prettify_refname(deco->name), sizeof(buf) - 1);
+ switch(deco->type) {
+ case DECORATION_NONE:
+ /* If the git-core doesn't recognize it,
+ * don't display anything. */
+ break;
+ case DECORATION_REF_LOCAL:
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);
+ ctx.qry.vpath, 0, NULL, NULL,
+ ctx.qry.showmsg, 0);
+ break;
+ case DECORATION_REF_TAG:
+ if (!peel_ref(deco->name, &peeled))
+ is_annotated = !oidcmp(&commit->object.oid, &peeled);
+ cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
+ break;
+ case DECORATION_REF_REMOTE:
+ if (!ctx.repo->enable_remote_branches)
+ break;
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);
+ oid_to_hex(&commit->object.oid),
+ ctx.qry.vpath, 0, NULL, NULL,
+ ctx.qry.showmsg, 0);
+ break;
+ default:
cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
- sha1_to_hex(commit->object.sha1),
- ctx.qry.vpath, 0);
+ oid_to_hex(&commit->object.oid),
+ ctx.qry.vpath);
+ break;
}
deco = deco->next;
}
+ html("</span>");
+}
+
+static void handle_rename(struct diff_filepair *pair)
+{
+ /*
+ * After we have seen a rename, we generate links to the previous
+ * name of the file so that commit & diff views get fed the path
+ * that is correct for the commit they are showing, avoiding the
+ * need to walk the entire history leading back to every commit we
+ * show in order detect renames.
+ */
+ if (0 != strcmp(ctx.qry.vpath, pair->two->path)) {
+ free(ctx.qry.vpath);
+ ctx.qry.vpath = xstrdup(pair->two->path);
+ }
+ inspect_files(pair);
+}
+
+static int show_commit(struct commit *commit, struct rev_info *revs)
+{
+ struct commit_list *parents = commit->parents;
+ struct commit *parent;
+ int found = 0, saved_fmt;
+ struct diff_flags saved_flags = revs->diffopt.flags;
+
+ /* Always show if we're not in "follow" mode with a single file. */
+ if (!ctx.qry.follow)
+ return 1;
+
+ /*
+ * In "follow" mode, we don't show merges. This is consistent with
+ * "git log --follow -- <file>".
+ */
+ if (parents && parents->next)
+ return 0;
+
+ /*
+ * If this is the root commit, do what rev_info tells us.
+ */
+ if (!parents)
+ return revs->show_root_diff;
+
+ /* When we get here we have precisely one parent. */
+ parent = parents->item;
+ /* If we can't parse the commit, let print_commit() report an error. */
+ if (parse_commit(parent))
+ return 1;
+
+ files = 0;
+ add_lines = 0;
+ rem_lines = 0;
+
+ revs->diffopt.flags.recursive = 1;
+ diff_tree_oid(&parent->tree->object.oid,
+ &commit->tree->object.oid,
+ "", &revs->diffopt);
+ diffcore_std(&revs->diffopt);
+
+ found = !diff_queue_is_empty();
+ saved_fmt = revs->diffopt.output_format;
+ revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
+ revs->diffopt.format_callback = cgit_diff_tree_cb;
+ revs->diffopt.format_callback_data = handle_rename;
+ diff_flush(&revs->diffopt);
+ revs->diffopt.output_format = saved_fmt;
+ revs->diffopt.flags = saved_flags;
+
+ lines_counted = 1;
+ return found;
}
-void print_commit(struct commit *commit, struct rev_info *revs)
+static void print_commit(struct commit *commit, struct rev_info *revs)
{
struct commitinfo *info;
- char *tmp;
- int cols = revs->graph ? 3 : 2;
+ int columns = revs->graph ? 4 : 3;
struct strbuf graphbuf = STRBUF_INIT;
struct strbuf msgbuf = STRBUF_INIT;
if (ctx.repo->enable_log_filecount)
- cols++;
+ columns++;
if (ctx.repo->enable_log_linecount)
- cols++;
+ columns++;
if (revs->graph) {
/* Advance graph until current commit */
/* 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);
+ htmlf("</td><td colspan='%d' /></tr>\n", columns);
strbuf_setlen(&graphbuf, 0);
}
/* Current commit's graph segment is now ready in graphbuf */
}
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();
+ cgit_print_age(info->committer_date, info->committer_tz, TM_WEEK * 2);
html("</td>");
}
}
}
cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
- sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
+ oid_to_hex(&commit->object.oid), 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>");
- 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();
+ cgit_print_age(info->committer_date, info->committer_tz, TM_WEEK * 2);
}
- if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) {
+ if (!lines_counted && (ctx.repo->enable_log_filecount ||
+ ctx.repo->enable_log_linecount)) {
files = 0;
add_lines = 0;
rem_lines = 0;
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);
+ htmlf("</td><td><span class='deletions'>-%d</span>/"
+ "<span class='insertions'>+%d</span>", rem_lines, add_lines);
html("</td></tr>\n");
- if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
- html("<tr class='nohover'>");
+ if ((revs->graph && !graph_is_commit_finished(revs->graph))
+ || ctx.qry.showmsg) { /* Print a second table row */
+ html("<tr class='nohover-highlight'>");
if (ctx.qry.showmsg) {
/* Concatenate commit message + notes in msgbuf */
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.oid,
+ &msgbuf, PAGE_ENCODING, 0);
strbuf_addch(&msgbuf, '\n');
strbuf_ltrim(&msgbuf);
}
html("<td/>"); /* Empty 'Age' column */
/* Print msgbuf into remainder of table row */
- htmlf("<td colspan='%d'%s>\n", cols,
+ htmlf("<td colspan='%d'%s>\n", columns - (revs->graph ? 1 : 0),
ctx.qry.showmsg ? " class='logmsg'" : "");
html_txt(msgbuf.buf);
html("</td></tr>\n");
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 object_id oid;
+ 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_oid(longref.buf, &oid) == 0) {
+ *must_free_result = 1;
+ return strbuf_detach(&longref, NULL);
+ }
+ *must_free_result = 0;
+ strbuf_release(&longref);
return ref;
}
}
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, 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;
+ struct argv_array rev_argv = ARGV_ARRAY_INIT;
+ int i, columns = commit_graph ? 4 : 3;
+ int must_free_tip = 0;
- /* First argv is NULL */
- vector_push(&vec, NULL, 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);
- vector_push(&vec, &tip, 0);
+ 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")) {
- arg = fmt("--%s=%s", grep, pattern);
- vector_push(&vec, &arg, 0);
- }
- if (!strcmp(grep, "range")) {
+ 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).
*/
- vec.count--;
+ argv_array_pop(&rev_argv);
while ((arg = next_token(&pattern))) {
if (*arg == '-') {
fprintf(stderr, "Bad range expr: %s\n",
arg);
break;
}
- vector_push(&vec, &arg, 0);
+ argv_array_push(&rev_argv, arg);
}
}
}
- 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);
+
+ if (!path || !ctx.cfg.enable_follow_links) {
+ /*
+ * If we don't have a path, "follow" is a no-op so make sure
+ * the variable is set to false to avoid needing to check
+ * both this and whether we have a path everywhere.
+ */
+ ctx.qry.follow = 0;
+ }
+
+ if (commit_graph && !ctx.qry.follow) {
+ argv_array_push(&rev_argv, "--graph");
+ argv_array_push(&rev_argv, "--color");
graph_set_column_colors(column_colors_html,
COLUMN_COLORS_HTML_MAX);
}
- if (path) {
- arg = "--";
- vector_push(&vec, &arg, 0);
- vector_push(&vec, &path, 0);
- }
+ if (commit_sort == 1)
+ argv_array_push(&rev_argv, "--date-order");
+ else if (commit_sort == 2)
+ argv_array_push(&rev_argv, "--topo-order");
- /* Make sure the vector is NULL-terminated */
- vector_push(&vec, NULL, 0);
- vec.count--;
+ if (path && ctx.qry.follow)
+ argv_array_push(&rev_argv, "--follow");
+ 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;
- setup_revisions(vec.count, vec.data, &rev, NULL);
- load_ref_decorations(DECORATE_FULL_REFS);
+ rev.ignore_missing = 1;
+ rev.simplify_history = 1;
+ setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
+ load_ref_decorations(NULL, DECORATE_FULL_REFS);
rev.show_decorations = 1;
- rev.grep_filter.regflags |= REG_ICASE;
+ rev.grep_filter.ignore_case = 1;
+
+ rev.diffopt.detect_rename = 1;
+ rev.diffopt.rename_limit = ctx.cfg.renamelimit;
+ if (ctx.qry.ignorews)
+ DIFF_XDL_SET(&rev.diffopt, IGNORE_WHITESPACE);
+
compile_grep_patterns(&rev.grep_filter);
prepare_revision_walk(&rev);
- if (pager)
+ if (pager) {
+ cgit_print_layout_start();
html("<table class='list nowrap'>");
+ }
html("<tr class='nohover'>");
if (commit_graph)
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);
+ ctx.qry.search, ctx.qry.showmsg ? 0 : 1,
+ ctx.qry.follow);
html(")");
}
html("</th><th class='left'>Author</th>");
- if (commit_graph)
+ if (rev.graph)
html("<th class='left'>Age</th>");
if (ctx.repo->enable_log_filecount) {
html("<th class='left'>Files</th>");
if (ofs<0)
ofs = 0;
- for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
- free(commit->buffer);
- commit->buffer = NULL;
+ for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) {
+ if (show_commit(commit, &rev))
+ 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->buffer = NULL;
+ for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; /* nop */) {
+ /*
+ * In "follow" mode, we must count the files and lines the
+ * first time we invoke diff on a given commit, and we need
+ * to do that to see if the commit touches the path we care
+ * about, so we do it in show_commit. Hence we must clear
+ * lines_counted here.
+ *
+ * This has the side effect of avoiding running diff twice
+ * when we are both following renames and showing file
+ * and/or line counts.
+ */
+ lines_counted = 0;
+ if (show_commit(commit, &rev)) {
+ i++;
+ print_commit(commit, &rev);
+ }
+ free_commit_buffer(commit);
free_commit_list(commit->parents);
commit->parents = NULL;
}
if (pager) {
- html("</table><div class='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(" ");
+ ctx.qry.search, ctx.qry.showmsg,
+ ctx.qry.follow);
+ 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);
+ ctx.qry.search, ctx.qry.showmsg,
+ ctx.qry.follow);
+ html("</li>");
}
- html("</div>");
+ html("</ul>");
+ cgit_print_layout_end();
} else if ((commit = get_revision(&rev)) != NULL) {
- html("<tr class='nohover'><td colspan='3'>");
+ 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);
+ ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg,
+ ctx.qry.follow);
html("</td></tr>\n");
}
+
+ /* If we allocated tip then it is safe to cast away const. */
+ if (must_free_tip)
+ free((char*) tip);
}
git.ckatri.com / cgit.git / blobdiff