X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/da1d4c77760ff6a0eb5cbfbaf6956930089d1963..5258c297ba6fb604ae1415fbc19a3fe42457e49e:/ui-log.c
diff --git a/ui-log.c b/ui-log.c
index 6bff948..20774bf 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -10,7 +10,7 @@
#include "ui-log.h"
#include "html.h"
#include "ui-shared.h"
-#include "argv-array.h"
+#include "strvec.h"
static int files, add_lines, rem_lines, lines_counted;
@@ -49,7 +49,7 @@ static void inspect_files(struct diff_filepair *pair)
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);
}
@@ -61,38 +61,43 @@ void show_commit_decorations(struct commit *commit)
buf[sizeof(buf) - 1] = 0;
deco = get_name_decoration(&commit->object);
+ if (!deco)
+ return;
html("");
while (deco) {
- if (starts_with(deco->name, "refs/heads/")) {
- strncpy(buf, deco->name + 11, sizeof(buf) - 1);
+ 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:
cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
- 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/")) {
+ ctx.qry.vpath, 0, NULL, NULL,
+ ctx.qry.showmsg, 0);
+ break;
+ case DECORATION_REF_TAG:
+ if (!read_ref(deco->name, &oid_tag) && !peel_iterated_oid(&oid_tag, &peeled))
+ is_annotated = !oideq(&oid_tag, &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)
- goto next;
- strncpy(buf, deco->name + 13, sizeof(buf) - 1);
+ break;
cgit_log_link(buf, NULL, "remote-deco", NULL,
- sha1_to_hex(commit->object.sha1),
- ctx.qry.vpath, 0, NULL, NULL,
- ctx.qry.showmsg, 0);
- }
- 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);
+ oid_to_hex(&commit->object.oid),
+ ctx.qry.vpath);
+ break;
}
-next:
deco = deco->next;
}
html("");
@@ -119,8 +124,7 @@ 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;
- unsigned saved_flags = revs->diffopt.flags;
-
+ 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)
@@ -141,16 +145,18 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
/* When we get here we have precisely one parent. */
parent = parents->item;
- parse_commit(parent);
+ /* 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;
- DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
- diff_tree_sha1(parent->tree->object.sha1,
- commit->tree->object.sha1,
- "", &revs->diffopt);
+ revs->diffopt.flags.recursive = 1;
+ diff_tree_oid(get_commit_tree_oid(parent),
+ get_commit_tree_oid(commit),
+ "", &revs->diffopt);
diffcore_std(&revs->diffopt);
found = !diff_queue_is_empty();
@@ -202,7 +208,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
}
else {
html("| ");
- cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
+ cgit_print_age(info->committer_date, info->committer_tz, TM_WEEK * 2);
html(" | ");
}
@@ -229,11 +235,11 @@ 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 */
- strcpy(info->subject + i, wrap_symbol);
+ strlcpy(info->subject + i, wrap_symbol, subject_len - i + 1);
}
}
cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
- sha1_to_hex(commit->object.sha1), ctx.qry.vpath);
+ oid_to_hex(&commit->object.oid), ctx.qry.vpath);
show_commit_decorations(commit);
html("");
cgit_open_filter(ctx.repo->email_filter, info->author_email, "log");
@@ -242,7 +248,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
if (revs->graph) {
html(" | ");
- cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
+ cgit_print_age(info->committer_date, info->committer_tz, TM_WEEK * 2);
}
if (!lines_counted && (ctx.repo->enable_log_filecount ||
@@ -256,12 +262,14 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
if (ctx.repo->enable_log_filecount)
htmlf(" | %d", files);
if (ctx.repo->enable_log_linecount)
- htmlf(" | -%d/+%d", rem_lines, add_lines);
+ htmlf(" | -%d/"
+ "+%d", rem_lines, add_lines);
html(" | \n");
- if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
- html("");
+ if ((revs->graph && !graph_is_commit_finished(revs->graph))
+ || ctx.qry.showmsg) { /* Print a second table row */
+ html("
");
if (ctx.qry.showmsg) {
/* Concatenate commit message + notes in msgbuf */
@@ -269,7 +277,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.sha1,
+ format_display_notes(&commit->object.oid,
&msgbuf, PAGE_ENCODING, 0);
strbuf_addch(&msgbuf, '\n');
strbuf_ltrim(&msgbuf);
@@ -322,7 +330,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 (get_sha1(longref.buf, oid.hash) == 0) {
+ if (get_oid(longref.buf, &oid) == 0) {
*must_free_result = 1;
return strbuf_detach(&longref, NULL);
}
@@ -355,27 +363,27 @@ 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, int commit_graph, int commit_sort)
+ const char *path, int pager, int commit_graph, int commit_sort)
{
struct rev_info rev;
struct commit *commit;
- struct argv_array rev_argv = ARGV_ARRAY_INIT;
+ struct strvec rev_argv = STRVEC_INIT;
int i, columns = commit_graph ? 4 : 3;
int must_free_tip = 0;
/* rev_argv.argv[0] will be ignored by setup_revisions */
- argv_array_push(&rev_argv, "log_rev_setup");
+ strvec_push(&rev_argv, "log_rev_setup");
if (!tip)
tip = ctx.qry.head;
tip = disambiguate_ref(tip, &must_free_tip);
- argv_array_push(&rev_argv, tip);
+ strvec_push(&rev_argv, tip);
if (grep && pattern && *pattern) {
pattern = xstrdup(pattern);
if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
!strcmp(grep, "committer")) {
- argv_array_pushf(&rev_argv, "--%s=%s", grep, pattern);
+ strvec_pushf(&rev_argv, "--%s=%s", grep, pattern);
} else if (!strcmp(grep, "range")) {
char *arg;
/* Split the pattern at whitespace and add each token
@@ -383,14 +391,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).
*/
- argv_array_pop(&rev_argv);
+ strvec_pop(&rev_argv);
while ((arg = next_token(&pattern))) {
if (*arg == '-') {
fprintf(stderr, "Bad range expr: %s\n",
arg);
break;
}
- argv_array_push(&rev_argv, arg);
+ strvec_push(&rev_argv, arg);
}
}
}
@@ -405,22 +413,22 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
}
if (commit_graph && !ctx.qry.follow) {
- argv_array_push(&rev_argv, "--graph");
- argv_array_push(&rev_argv, "--color");
+ strvec_push(&rev_argv, "--graph");
+ strvec_push(&rev_argv, "--color");
graph_set_column_colors(column_colors_html,
COLUMN_COLORS_HTML_MAX);
}
if (commit_sort == 1)
- argv_array_push(&rev_argv, "--date-order");
+ strvec_push(&rev_argv, "--date-order");
else if (commit_sort == 2)
- argv_array_push(&rev_argv, "--topo-order");
+ strvec_push(&rev_argv, "--topo-order");
if (path && ctx.qry.follow)
- argv_array_push(&rev_argv, "--follow");
- argv_array_push(&rev_argv, "--");
+ strvec_push(&rev_argv, "--follow");
+ strvec_push(&rev_argv, "--");
if (path)
- argv_array_push(&rev_argv, path);
+ strvec_push(&rev_argv, path);
init_revisions(&rev, NULL);
rev.abbrev = DEFAULT_ABBREV;
@@ -429,10 +437,10 @@ 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.argc, rev_argv.argv, &rev, NULL);
- load_ref_decorations(DECORATE_FULL_REFS);
+ setup_revisions(rev_argv.nr, rev_argv.v, &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;
@@ -442,8 +450,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
compile_grep_patterns(&rev.grep_filter);
prepare_revision_walk(&rev);
- if (pager)
+ if (pager) {
+ cgit_print_layout_start();
html("");
+ }
html("");
if (commit_graph)
@@ -454,7 +464,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.sha1,
+ NULL, ctx.qry.head, ctx.qry.oid,
ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
ctx.qry.search, ctx.qry.showmsg ? 0 : 1,
ctx.qry.follow);
@@ -479,7 +489,7 @@ 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++;
- free_commit_buffer(commit);
+ free_commit_buffer(the_repository->parsed_objects, commit);
free_commit_list(commit->parents);
commit->parents = NULL;
}
@@ -501,7 +511,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
i++;
print_commit(commit, &rev);
}
- free_commit_buffer(commit);
+ free_commit_buffer(the_repository->parsed_objects, commit);
free_commit_list(commit->parents);
commit->parents = NULL;
}
@@ -510,7 +520,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
if (ofs > 0) {
html("");
cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
- ctx.qry.sha1, ctx.qry.vpath,
+ ctx.qry.oid, ctx.qry.vpath,
ofs - cnt, ctx.qry.grep,
ctx.qry.search, ctx.qry.showmsg,
ctx.qry.follow);
@@ -519,13 +529,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
if ((commit = get_revision(&rev)) != NULL) {
html("");
cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
- ctx.qry.sha1, ctx.qry.vpath,
+ ctx.qry.oid, ctx.qry.vpath,
ofs + cnt, ctx.qry.grep,
ctx.qry.search, ctx.qry.showmsg,
ctx.qry.follow);
html("");
}
html("");
+ cgit_print_layout_end();
} else if ((commit = get_revision(&rev)) != NULL) {
htmlf("
| ", columns);
cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
|