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.c142
1 files changed, 67 insertions, 75 deletions
diff --git a/ui-log.c b/ui-log.c
index 9906bbc..0a3938b 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -6,13 +6,11 @@
* (see COPYING for full license text)
*/
-#define USE_THE_REPOSITORY_VARIABLE
-
#include "cgit.h"
#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;
@@ -51,7 +49,7 @@ static void inspect_files(struct diff_filepair *pair)
files++;
if (ctx.repo->enable_log_linecount)
- cgit_diff_files(&pair->one->oid, &pair->two->oid, &old_size,
+ cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
&new_size, &binary, 0, ctx.qry.ignorews,
count_lines);
}
@@ -63,44 +61,38 @@ void show_commit_decorations(struct commit *commit)
buf[sizeof(buf) - 1] = 0;
deco = get_name_decoration(&commit->object);
- if (!deco)
- return;
html("<span class='decoration'>");
while (deco) {
- struct object_id oid_tag, peeled;
- int is_annotated = 0;
-
- strlcpy(buf, prettify_refname(deco->name), sizeof(buf));
- switch(deco->type) {
- case DECORATION_NONE:
- /* If the git-core doesn't recognize it,
- * don't display anything. */
- break;
- case DECORATION_REF_LOCAL:
+ 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, 0);
- break;
- case DECORATION_REF_TAG:
- if (!refs_read_ref(get_main_ref_store(the_repository), deco->name, &oid_tag) &&
- !peel_object(the_repository, &oid_tag, &peeled, PEEL_OBJECT_VERIFY_TAGGED_OBJECT_TYPE))
- is_annotated = !oideq(&oid_tag, &peeled);
- cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
- break;
- case DECORATION_REF_REMOTE:
+ ctx.qry.vpath, 0, NULL, NULL,
+ ctx.qry.showmsg, 0);
+ }
+ else if (starts_with(deco->name, "tag: refs/tags/")) {
+ strncpy(buf, deco->name + 15, sizeof(buf) - 1);
+ cgit_tag_link(buf, NULL, "tag-deco", buf);
+ }
+ else if (starts_with(deco->name, "refs/tags/")) {
+ strncpy(buf, deco->name + 10, sizeof(buf) - 1);
+ cgit_tag_link(buf, NULL, "tag-deco", buf);
+ }
+ else if (starts_with(deco->name, "refs/remotes/")) {
if (!ctx.repo->enable_remote_branches)
- break;
+ goto next;
+ strncpy(buf, deco->name + 13, sizeof(buf) - 1);
cgit_log_link(buf, NULL, "remote-deco", NULL,
- oid_to_hex(&commit->object.oid),
- ctx.qry.vpath, 0, NULL, NULL,
- ctx.qry.showmsg, 0);
- break;
- default:
+ oid_to_hex(&commit->object.oid),
+ ctx.qry.vpath, 0, NULL, NULL,
+ ctx.qry.showmsg, 0);
+ }
+ else {
+ strncpy(buf, deco->name, sizeof(buf) - 1);
cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
- oid_to_hex(&commit->object.oid),
- ctx.qry.vpath);
- break;
+ oid_to_hex(&commit->object.oid),
+ ctx.qry.vpath);
}
+next:
deco = deco->next;
}
html("</span>");
@@ -127,7 +119,8 @@ 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;
+ unsigned saved_flags = revs->diffopt.flags;
+
/* Always show if we're not in "follow" mode with a single file. */
if (!ctx.qry.follow)
@@ -149,25 +142,24 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
/* 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 (repo_parse_commit(the_repository, parent))
+ if (parse_commit(parent))
return 1;
files = 0;
add_lines = 0;
rem_lines = 0;
- revs->diffopt.flags.recursive = 1;
- diff_tree_oid(get_commit_tree_oid(parent),
- get_commit_tree_oid(commit),
- "", &revs->diffopt);
+ DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
+ diff_tree_sha1(parent->tree->object.oid.hash,
+ commit->tree->object.oid.hash,
+ "", &revs->diffopt);
diffcore_std(&revs->diffopt);
- found = !diff_queue_is_empty(&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;
- revs->diffopt.no_free = 1;
diff_flush(&revs->diffopt);
revs->diffopt.output_format = saved_fmt;
revs->diffopt.flags = saved_flags;
@@ -239,7 +231,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
strbuf_add(&msgbuf, "\n\n", 2);
/* Place wrap_symbol at position i in info->subject */
- strlcpy(info->subject + i, wrap_symbol, subject_len - i + 1);
+ strcpy(info->subject + i, wrap_symbol);
}
}
cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
@@ -266,14 +258,12 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
if (ctx.repo->enable_log_filecount)
htmlf("</td><td>%d", files);
if (ctx.repo->enable_log_linecount)
- htmlf("</td><td><span class='deletions'>-%d</span>/"
- "<span class='insertions'>+%d</span>", rem_lines, add_lines);
+ htmlf("</td><td>-%d/+%d", rem_lines, add_lines);
html("</td></tr>\n");
- if ((revs->graph && !graph_is_commit_finished(revs->graph))
- || ctx.qry.showmsg) { /* Print a second table row */
- html("<tr class='nohover-highlight'>");
+ 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 */
@@ -281,7 +271,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
strbuf_addstr(&msgbuf, info->msg);
strbuf_addch(&msgbuf, '\n');
}
- format_display_notes(&commit->object.oid,
+ format_display_notes(commit->object.oid.hash,
&msgbuf, PAGE_ENCODING, 0);
strbuf_addch(&msgbuf, '\n');
strbuf_ltrim(&msgbuf);
@@ -334,7 +324,7 @@ static const char *disambiguate_ref(const char *ref, int *must_free_result)
struct strbuf longref = STRBUF_INIT;
strbuf_addf(&longref, "refs/heads/%s", ref);
- if (repo_get_oid(the_repository, longref.buf, &oid) == 0) {
+ if (get_sha1(longref.buf, oid.hash) == 0) {
*must_free_result = 1;
return strbuf_detach(&longref, NULL);
}
@@ -367,27 +357,27 @@ static char *next_token(char **src)
}
void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
- const char *path, int pager, int commit_graph, int commit_sort)
+ char *path, int pager, int commit_graph, int commit_sort)
{
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
@@ -395,19 +385,19 @@ 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);
}
}
}
- if (!path || !ctx.repo->enable_follow_links) {
+ 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
@@ -417,34 +407,34 @@ 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);
- repo_init_revisions(the_repository, &rev, NULL);
+ init_revisions(&rev, NULL);
rev.abbrev = DEFAULT_ABBREV;
rev.commit_format = CMIT_FMT_DEFAULT;
rev.verbose_header = 1;
rev.show_root_diff = 0;
rev.ignore_missing = 1;
rev.simplify_history = 1;
- setup_revisions(rev_argv.nr, rev_argv.v, &rev, NULL);
- load_ref_decorations(NULL, DECORATE_FULL_REFS);
+ setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
+ load_ref_decorations(DECORATE_FULL_REFS);
rev.show_decorations = 1;
- rev.grep_filter.ignore_case = 1;
+ rev.grep_filter.regflags |= REG_ICASE;
rev.diffopt.detect_rename = 1;
rev.diffopt.rename_limit = ctx.cfg.renamelimit;
@@ -468,7 +458,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
if (pager) {
html(" (");
cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
- NULL, ctx.qry.head, ctx.qry.oid,
+ 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.follow);
@@ -493,7 +483,8 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) {
if (show_commit(commit, &rev))
i++;
- release_commit_memory(the_repository->parsed_objects, commit);
+ free_commit_buffer(commit);
+ free_commit_list(commit->parents);
commit->parents = NULL;
}
@@ -514,7 +505,8 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
i++;
print_commit(commit, &rev);
}
- release_commit_memory(the_repository->parsed_objects, commit);
+ free_commit_buffer(commit);
+ free_commit_list(commit->parents);
commit->parents = NULL;
}
if (pager) {
@@ -522,7 +514,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
if (ofs > 0) {
html("<li>");
cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
- ctx.qry.oid, ctx.qry.vpath,
+ ctx.qry.sha1, ctx.qry.vpath,
ofs - cnt, ctx.qry.grep,
ctx.qry.search, ctx.qry.showmsg,
ctx.qry.follow);
@@ -531,7 +523,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
if ((commit = get_revision(&rev)) != NULL) {
html("<li>");
cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
- ctx.qry.oid, ctx.qry.vpath,
+ ctx.qry.sha1, ctx.qry.vpath,
ofs + cnt, ctx.qry.grep,
ctx.qry.search, ctx.qry.showmsg,
ctx.qry.follow);
generated by cgitext v1.3.1+16 (git 2.54.0) at 2026-09-07 18:52:07 +0000