X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/8f208794318f83826e98168b8b430f2d9a68bcce..8eef4589d0ba80fd4e6a9ce2f3ca4fcf266a64e0:/ui-log.c diff --git a/ui-log.c b/ui-log.c index 8592843..32b4c47 100644 --- a/ui-log.c +++ b/ui-log.c @@ -1,6 +1,6 @@ /* ui-log.c: functions for log output * - * Copyright (C) 2006 Lars Hjemli + * Copyright (C) 2006-2014 cgit Development Team * * Licensed under GNU General Public License v2 * (see COPYING for full license text) @@ -10,9 +10,9 @@ #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; /* * The list of available column colors in the commit graph. @@ -56,27 +56,28 @@ static void inspect_files(struct diff_filepair *pair) 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); + html(""); while (deco) { - if (!prefixcmp(deco->name, "refs/heads/")) { + 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 (!prefixcmp(deco->name, "tag: refs/tags/")) { + else if (starts_with(deco->name, "tag: refs/tags/")) { strncpy(buf, deco->name + 15, sizeof(buf) - 1); - cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); + cgit_tag_link(buf, NULL, "tag-deco", buf); } - else if (!prefixcmp(deco->name, "refs/tags/")) { + else if (starts_with(deco->name, "refs/tags/")) { strncpy(buf, deco->name + 10, sizeof(buf) - 1); - cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); + cgit_tag_link(buf, NULL, "tag-deco", buf); } - else if (!prefixcmp(deco->name, "refs/remotes/")) { + else if (starts_with(deco->name, "refs/remotes/")) { if (!ctx.repo->enable_remote_branches) goto next; strncpy(buf, deco->name + 13, sizeof(buf) - 1); @@ -89,11 +90,12 @@ void show_commit_decorations(struct commit *commit) 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); + ctx.qry.vpath); } next: deco = deco->next; } + html(""); } static void print_commit(struct commit *commit, struct rev_info *revs) @@ -163,10 +165,12 @@ static void print_commit(struct commit *commit, struct rev_info *revs) } } cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, - sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); + sha1_to_hex(commit->object.sha1), ctx.qry.vpath); show_commit_decorations(commit); html(""); + 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(""); @@ -243,15 +247,19 @@ static void print_commit(struct commit *commit, struct rev_info *revs) 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; } @@ -282,75 +290,64 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern { struct rev_info rev; struct commit *commit; - struct vector vec = VECTOR_INIT(char *); + struct argv_array rev_argv = ARGV_ARRAY_INIT; int i, columns = commit_graph ? 4 : 3; - char *arg; + 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); + 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) { - 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); - 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--; + 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); + 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; @@ -391,17 +388,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern ofs = 0; for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { - free(commit->buffer); - commit->buffer = NULL; + free_commit_buffer(commit); free_commit_list(commit->parents); commit->parents = NULL; } - init_display_notes(NULL); for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { print_commit(commit, &rev); - free(commit->buffer); - commit->buffer = NULL; + free_commit_buffer(commit); free_commit_list(commit->parents); commit->parents = NULL; } @@ -430,4 +424,8 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern 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); }