ui-log: handle parse_commit() errors

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 6bff94807886c39e5e15ec58e66f67a81b50187b..a4dc7070c37b832f029bebf390c533672bd778ac 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -82,14 +82,14 @@ void show_commit_decorations(struct commit *commit)
                                goto next;
                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                        cgit_log_link(buf, NULL, "remote-deco", NULL,
                                goto next;
                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                        cgit_log_link(buf, NULL, "remote-deco", NULL,

-                                     sha1_to_hex(commit->object.sha1),
+                                     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,
                                      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,

-                                        sha1_to_hex(commit->object.sha1),
+                                        oid_to_hex(&commit->object.oid),

                                         ctx.qry.vpath);
                }
 next:
                                         ctx.qry.vpath);
                }
 next:


@@ -141,15 +141,17 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
 
        /* When we get here we have precisely one parent. */
        parent = parents->item;
 
        /* 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);
 
        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,
+       diff_tree_sha1(parent->tree->object.oid.hash,
+                      commit->tree->object.oid.hash,

                       "", &revs->diffopt);
        diffcore_std(&revs->diffopt);
 
                       "", &revs->diffopt);
        diffcore_std(&revs->diffopt);
 


@@ -233,7 +235,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
                }
        }
        cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
                }
        }
        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("</td><td>");
        cgit_open_filter(ctx.repo->email_filter, info->author_email, "log");
        show_commit_decorations(commit);
        html("</td><td>");
        cgit_open_filter(ctx.repo->email_filter, info->author_email, "log");


@@ -269,7 +271,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
                                strbuf_addstr(&msgbuf, info->msg);
                                strbuf_addch(&msgbuf, '\n');
                        }
                                strbuf_addstr(&msgbuf, info->msg);
                                strbuf_addch(&msgbuf, '\n');
                        }

-                       format_display_notes(commit->object.sha1,
+                       format_display_notes(commit->object.oid.hash,

                                             &msgbuf, PAGE_ENCODING, 0);
                        strbuf_addch(&msgbuf, '\n');
                        strbuf_ltrim(&msgbuf);
                                             &msgbuf, PAGE_ENCODING, 0);
                        strbuf_addch(&msgbuf, '\n');
                        strbuf_ltrim(&msgbuf);


@@ -442,8 +444,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);
 
        compile_grep_patterns(&rev.grep_filter);
        prepare_revision_walk(&rev);
 

-       if (pager)
+       if (pager) {
+               cgit_print_layout_start();

                html("<table class='list nowrap'>");
                html("<table class='list nowrap'>");

+       }

 
        html("<tr class='nohover'>");
        if (commit_graph)
 
        html("<tr class='nohover'>");
        if (commit_graph)


@@ -526,6 +530,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                        html("</li>");
                }
                html("</ul>");
                        html("</li>");
                }
                html("</ul>");

+               cgit_print_layout_end();

        } else if ((commit = get_revision(&rev)) != NULL) {
                htmlf("<tr class='nohover'><td colspan='%d'>", columns);
                cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
        } else if ((commit = get_revision(&rev)) != NULL) {
                htmlf("<tr class='nohover'><td colspan='%d'>", columns);
                cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,