Diffstat (limited to 'ui-blame.c')
| -rw-r--r-- | ui-blame.c | 174 |
1 files changed, 50 insertions, 124 deletions
@@ -6,13 +6,11 @@ * (see COPYING for full license text) */ -#define USE_THE_REPOSITORY_VARIABLE - #include "cgit.h" #include "ui-blame.h" #include "html.h" #include "ui-shared.h" -#include "strvec.h" +#include "argv-array.h" #include "blame.h" @@ -47,26 +45,11 @@ static void emit_blame_entry_hash(struct blame_entry *ent) { struct blame_origin *suspect = ent->suspect; struct object_id *oid = &suspect->commit->object.oid; - unsigned long line = 0; char *detail = emit_suspect_detail(suspect); - html("<span class='oid'>"); - cgit_commit_link(repo_find_unique_abbrev(the_repository, oid, DEFAULT_ABBREV), detail, + cgit_commit_link(find_unique_abbrev(oid->hash, DEFAULT_ABBREV), detail, NULL, ctx.qry.head, oid_to_hex(oid), suspect->path); - html("</span>"); free(detail); - - if (!repo_parse_commit(the_repository, suspect->commit) && suspect->commit->parents) { - struct commit *parent = suspect->commit->parents->item; - - html(" "); - cgit_blame_link("^", "Blame the previous revision", NULL, - ctx.qry.head, oid_to_hex(&parent->object.oid), - suspect->path); - } - - while (line++ < ent->num_lines) - html("\n"); } static void emit_blame_entry_linenumber(struct blame_entry *ent) @@ -78,29 +61,33 @@ static void emit_blame_entry_linenumber(struct blame_entry *ent) htmlf(numberfmt, ++lineno); } -static void emit_blame_entry_line_background(struct blame_scoreboard *sb, - struct blame_entry *ent) +static void emit_blame_entry_line(struct blame_scoreboard *sb, + struct blame_entry *ent) { - unsigned long line; - size_t len, maxlen = 2; - const char* pos, *endpos; + const char *cp, *cpend; - for (line = ent->lno; line < ent->lno + ent->num_lines; line++) { - html("\n"); - pos = blame_nth_line(sb, line); - endpos = blame_nth_line(sb, line + 1); - len = 0; - while (pos < endpos) { - len++; - if (*pos++ == '\t') - len = (len + 7) & ~7; - } - if (len > maxlen) - maxlen = len; + cp = blame_nth_line(sb, ent->lno); + cpend = blame_nth_line(sb, ent->lno + ent->num_lines); + + html_ntxt(cp, cpend - cp); +} + +static void emit_blame_entry(struct blame_scoreboard *sb, + struct blame_entry *ent) +{ + html("<tr><td class='sha1 hashes'>"); + emit_blame_entry_hash(ent); + html("</td>\n"); + + if (ctx.cfg.enable_tree_linenumbers) { + html("<td class='linenumbers'><pre>"); + emit_blame_entry_linenumber(ent); + html("</pre></td>\n"); } - for (len = 0; len < maxlen - 1; len++) - html(" "); + html("<td class='lines'><pre><code>"); + emit_blame_entry_line(sb, ent); + html("</code></pre></td></tr>\n"); } struct walk_tree_context { @@ -109,42 +96,32 @@ struct walk_tree_context { int state; }; -static void print_object(const struct object_id *oid, const char *path, +static void print_object(const unsigned char *sha1, const char *path, const char *basename, const char *rev) { enum object_type type; - char *buf; unsigned long size; - struct strvec rev_argv = STRVEC_INIT; + struct argv_array rev_argv = ARGV_ARRAY_INIT; struct rev_info revs; struct blame_scoreboard sb; struct blame_origin *o; struct blame_entry *ent = NULL; - type = odb_read_object_info(the_repository->objects, oid, &size); + type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { cgit_print_error_page(404, "Not found", "Bad object name: %s", - oid_to_hex(oid)); + sha1_to_hex(sha1)); return; } - buf = odb_read_object(the_repository->objects, oid, &type, &size); - if (!buf) { - cgit_print_error_page(500, "Internal server error", - "Error reading object %s", oid_to_hex(oid)); - return; - } - - strvec_push(&rev_argv, "blame"); - strvec_push(&rev_argv, rev); - repo_init_revisions(the_repository, &revs, NULL); + argv_array_push(&rev_argv, "blame"); + argv_array_push(&rev_argv, rev); + init_revisions(&revs, NULL); revs.diffopt.flags.allow_textconv = 1; - setup_revisions(rev_argv.nr, rev_argv.v, &revs, NULL); + setup_revisions(rev_argv.argc, rev_argv.argv, &revs, NULL); init_scoreboard(&sb); sb.revs = &revs; - sb.repo = the_repository; - sb.path = path; - setup_scoreboard(&sb, &o); + setup_scoreboard(&sb, path, &o); o->suspects = blame_entry_prepend(NULL, 0, sb.num_lines, o); prio_queue_put(&sb.commits, o->commit); blame_origin_decref(o); @@ -157,86 +134,35 @@ static void print_object(const struct object_id *oid, const char *path, cgit_set_title_from_path(path); cgit_print_layout_start(); - htmlf("blob: %s (", oid_to_hex(oid)); + htmlf("blob: %s (", sha1_to_hex(sha1)); cgit_plain_link("plain", NULL, NULL, ctx.qry.head, rev, path); html(") ("); cgit_tree_link("tree", NULL, NULL, ctx.qry.head, rev, path); html(")\n"); - if (buffer_is_binary(buf, size)) { - html("<div class='error'>blob is binary.</div>"); - goto cleanup; - } if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) { htmlf("<div class='error'>blob size (%ldKB)" " exceeds display size limit (%dKB).</div>", size / 1024, ctx.cfg.max_blob_size); - goto cleanup; - } - - html("<table class='blame blob'>\n<tr>\n"); - - /* Commit hashes */ - html("<td class='hashes'>"); - for (ent = sb.ent; ent; ent = ent->next) { - html("<div class='alt'><pre>"); - emit_blame_entry_hash(ent); - html("</pre></div>"); - } - html("</td>\n"); - - /* Line numbers */ - if (ctx.cfg.enable_tree_linenumbers) { - html("<td class='linenumbers'>"); - for (ent = sb.ent; ent; ent = ent->next) { - html("<div class='alt'><pre>"); - emit_blame_entry_linenumber(ent); - html("</pre></div>"); - } - html("</td>\n"); + return; } - html("<td class='lines'><div>"); - - /* Colored bars behind lines */ - html("<div>"); + html("<table class='blame blob'>"); for (ent = sb.ent; ent; ) { struct blame_entry *e = ent->next; - html("<div class='alt'><pre>"); - emit_blame_entry_line_background(&sb, ent); - html("</pre></div>"); + emit_blame_entry(&sb, ent); free(ent); ent = e; } - html("</div>"); - + html("</table>\n"); free((void *)sb.final_buf); - /* Lines */ - html("<pre><code>"); - if (ctx.repo->source_filter) { - char *filter_arg = xstrdup(basename); - cgit_open_filter(ctx.repo->source_filter, filter_arg); - html_raw(buf, size); - cgit_close_filter(ctx.repo->source_filter); - free(filter_arg); - } else { - html_txt(buf); - } - html("</code></pre>"); - - html("</div></td>\n"); - - html("</tr>\n</table>\n"); - cgit_print_layout_end(); - -cleanup: - free(buf); } -static int walk_tree(const struct object_id *oid, struct strbuf *base, - const char *pathname, unsigned mode, void *cbdata) +static int walk_tree(const unsigned char *sha1, struct strbuf *base, + const char *pathname, unsigned mode, int stage, + void *cbdata) { struct walk_tree_context *walk_tree_ctx = cbdata; @@ -245,7 +171,7 @@ static int walk_tree(const struct object_id *oid, struct strbuf *base, struct strbuf buffer = STRBUF_INIT; strbuf_addbuf(&buffer, base); strbuf_addstr(&buffer, pathname); - print_object(oid, buffer.buf, pathname, + print_object(sha1, buffer.buf, pathname, walk_tree_ctx->curr_rev); strbuf_release(&buffer); walk_tree_ctx->state = 1; @@ -263,7 +189,7 @@ static int walk_tree(const struct object_id *oid, struct strbuf *base, static int basedir_len(const char *path) { - const char *p = strrchr(path, '/'); + char *p = strrchr(path, '/'); if (p) return p - path + 1; return 0; @@ -271,7 +197,7 @@ static int basedir_len(const char *path) void cgit_print_blame(void) { - const char *rev = ctx.qry.oid; + const char *rev = ctx.qry.sha1; struct object_id oid; struct commit *commit; struct pathspec_item path_items = { @@ -289,13 +215,13 @@ void cgit_print_blame(void) if (!rev) rev = ctx.qry.head; - if (repo_get_oid(the_repository, rev, &oid)) { + if (get_oid(rev, &oid)) { cgit_print_error_page(404, "Not found", "Invalid revision name: %s", rev); return; } - commit = lookup_commit_reference(the_repository, &oid); - if (!commit || repo_parse_commit(the_repository, commit)) { + commit = lookup_commit_reference(&oid); + if (!commit || parse_commit(commit)) { cgit_print_error_page(404, "Not found", "Invalid commit reference: %s", rev); return; @@ -305,8 +231,8 @@ void cgit_print_blame(void) walk_tree_ctx.match_baselen = (path_items.match) ? basedir_len(path_items.match) : -1; - read_tree(the_repository, repo_get_commit_tree(the_repository, commit), - &paths, walk_tree, &walk_tree_ctx); + read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, + &walk_tree_ctx); if (!walk_tree_ctx.state) cgit_print_error_page(404, "Not found", "Not found"); else if (walk_tree_ctx.state == 2) |