Diffstat (limited to 'ui-log.c')
| -rw-r--r-- | ui-log.c | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -10,7 +10,7 @@ #include "ui-log.h" #include "html.h" #include "ui-shared.h" -#include "strvec.h" +#include "argv-array.h" static int files, add_lines, rem_lines, lines_counted; @@ -366,23 +366,23 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern { struct rev_info rev; struct commit *commit; - struct strvec rev_argv = STRVEC_INIT; + 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 */ - strvec_push(&rev_argv, "log_rev_setup"); + argv_array_push(&rev_argv, "log_rev_setup"); if (!tip) tip = ctx.qry.head; tip = disambiguate_ref(tip, &must_free_tip); - strvec_push(&rev_argv, tip); + argv_array_push(&rev_argv, tip); if (grep && pattern && *pattern) { pattern = xstrdup(pattern); if (!strcmp(grep, "grep") || !strcmp(grep, "author") || !strcmp(grep, "committer")) { - strvec_pushf(&rev_argv, "--%s=%s", grep, pattern); + 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 @@ -390,14 +390,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern * rev-list options. Also, replace the previously * pushed tip (it's no longer relevant). */ - strvec_pop(&rev_argv); + argv_array_pop(&rev_argv); while ((arg = next_token(&pattern))) { if (*arg == '-') { fprintf(stderr, "Bad range expr: %s\n", arg); break; } - strvec_push(&rev_argv, arg); + argv_array_push(&rev_argv, arg); } } } @@ -412,22 +412,22 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern } if (commit_graph && !ctx.qry.follow) { - strvec_push(&rev_argv, "--graph"); - strvec_push(&rev_argv, "--color"); + 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) - strvec_push(&rev_argv, "--date-order"); + argv_array_push(&rev_argv, "--date-order"); else if (commit_sort == 2) - strvec_push(&rev_argv, "--topo-order"); + argv_array_push(&rev_argv, "--topo-order"); if (path && ctx.qry.follow) - strvec_push(&rev_argv, "--follow"); - strvec_push(&rev_argv, "--"); + argv_array_push(&rev_argv, "--follow"); + argv_array_push(&rev_argv, "--"); if (path) - strvec_push(&rev_argv, path); + argv_array_push(&rev_argv, path); init_revisions(&rev, NULL); rev.abbrev = DEFAULT_ABBREV; @@ -436,7 +436,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern rev.show_root_diff = 0; rev.ignore_missing = 1; rev.simplify_history = 1; - setup_revisions(rev_argv.nr, rev_argv.v, &rev, NULL); + setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL); load_ref_decorations(NULL, DECORATE_FULL_REFS); rev.show_decorations = 1; rev.grep_filter.ignore_case = 1; |