configfile: fix EOF handling

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 0a3938bf97c581b92e5ba0576d8232fd78c32a3a..a31ff7c7df52c6de69cb21f66acbcc1b83ad3ee7 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -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,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) {
-               if (starts_with(deco->name, "refs/heads/")) {
-                       strncpy(buf, deco->name + 11, sizeof(buf) - 1);
+               strncpy(buf, prettify_refname(deco->name), sizeof(buf) - 1);
+               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);
+                               ctx.qry.vpath, 0, NULL, NULL,
+                               ctx.qry.showmsg, 0);
+                       break;
+               case DECORATION_REF_TAG:
                        cgit_tag_link(buf, NULL, "tag-deco", buf);
-               }
-               else if (starts_with(deco->name, "refs/remotes/")) {
+                       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,
-                                     oid_to_hex(&commit->object.oid),
-                                     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,
-                                        oid_to_hex(&commit->object.oid),
-                                        ctx.qry.vpath);
+                                       oid_to_hex(&commit->object.oid),
+                                       ctx.qry.vpath);
+                       break;
                }
-next:
                deco = deco->next;
        }
        html("</span>");
@@ -258,7 +258,8 @@ 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>-%d/+%d", rem_lines, add_lines);
+               htmlf("</td><td><span class='deletions'>-%d</span>/"
+                       "<span class='insertions'>+%d</span>", rem_lines, add_lines);
 
        html("</td></tr>\n");