fix building with clang

[ps-cgit] / ui-blame.c

diff --git a/ui-blame.c b/ui-blame.c
index cfab7fb98f0401557deca9c7a23716ca66336e4b..e0f0593f437137a5ddd5a37bfb7c4f305e3eef15 100644 (file)
--- a/ui-blame.c
+++ b/ui-blame.c
@@ -49,11 +49,20 @@ static void emit_blame_entry_hash(struct blame_entry *ent)
 
        char *detail = emit_suspect_detail(suspect);
        html("<span class='oid'>");
-       cgit_commit_link(find_unique_abbrev(oid, DEFAULT_ABBREV), detail,
+       cgit_commit_link(repo_find_unique_abbrev(the_repository, oid, 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");
 }
@@ -117,7 +126,7 @@ static void print_object(const struct object_id *oid, const char *path,
                return;
        }
 
-       buf = read_object_file(oid, &type, &size);
+       buf = repo_read_object_file(the_repository, oid, &type, &size);
        if (!buf) {
                cgit_print_error_page(500, "Internal server error",
                        "Error reading object %s", oid_to_hex(oid));
@@ -126,13 +135,14 @@ static void print_object(const struct object_id *oid, const char *path,
 
        strvec_push(&rev_argv, "blame");
        strvec_push(&rev_argv, rev);
-       init_revisions(&revs, NULL);
+       repo_init_revisions(the_repository, &revs, NULL);
        revs.diffopt.flags.allow_textconv = 1;
        setup_revisions(rev_argv.nr, rev_argv.v, &revs, NULL);
        init_scoreboard(&sb);
        sb.revs = &revs;
        sb.repo = the_repository;
-       setup_scoreboard(&sb, path, &o);
+       sb.path = path;
+       setup_scoreboard(&sb, &o);
        o->suspects = blame_entry_prepend(NULL, 0, sb.num_lines, o);
        prio_queue_put(&sb.commits, o->commit);
        blame_origin_decref(o);
@@ -151,6 +161,10 @@ static void print_object(const struct object_id *oid, const char *path,
        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>",
@@ -220,8 +234,7 @@ cleanup:
 }
 
 static int walk_tree(const struct object_id *oid, struct strbuf *base,
-                    const char *pathname, unsigned mode, int stage,
-                    void *cbdata)
+                    const char *pathname, unsigned mode, void *cbdata)
 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
 
@@ -274,13 +287,13 @@ void cgit_print_blame(void)
        if (!rev)
                rev = ctx.qry.head;
 
-       if (get_oid(rev, &oid)) {
+       if (repo_get_oid(the_repository, rev, &oid)) {
                cgit_print_error_page(404, "Not found",
                        "Invalid revision name: %s", rev);
                return;
        }
        commit = lookup_commit_reference(the_repository, &oid);
-       if (!commit || parse_commit(commit)) {
+       if (!commit || repo_parse_commit(the_repository, commit)) {
                cgit_print_error_page(404, "Not found",
                        "Invalid commit reference: %s", rev);
                return;
@@ -290,10 +303,8 @@ void cgit_print_blame(void)
        walk_tree_ctx.match_baselen = (path_items.match) ?
                                       basedir_len(path_items.match) : -1;
 
-       read_tree_recursive(the_repository,
-                           repo_get_commit_tree(the_repository, commit),
-                           "", 0, 0,
-                           &paths, walk_tree, &walk_tree_ctx);
+       read_tree(the_repository, repo_get_commit_tree(the_repository, commit),
+                 &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)