ui-blame: Make each column into a single table cell

[ps-cgit] / ui-blame.c

diff --git a/ui-blame.c b/ui-blame.c
index 62cf4315da77b1a3c429d9c333af72b09ce5a4a9..d565fffa697914391d3cdc9cad5b40291307db36 100644 (file)
--- a/ui-blame.c
+++ b/ui-blame.c
@@ -41,37 +41,41 @@ static char *emit_suspect_detail(struct blame_origin *suspect)
        return strbuf_detach(&detail, NULL);
 }
 
-static void emit_blame_entry(struct blame_scoreboard *sb,
-                            struct blame_entry *ent)
+static void emit_blame_entry_hash(struct blame_entry *ent)
 {
        struct blame_origin *suspect = ent->suspect;
        struct object_id *oid = &suspect->commit->object.oid;
-       const char *numberfmt = "<a id='n%1$d' href='#n%1$d'>%1$d</a>\n";
-       const char *cp, *cpend;
+       unsigned long line = 0;
 
        char *detail = emit_suspect_detail(suspect);
-
-       html("<tr><td class='sha1 lines'>");
+       html("<span class='sha1'>");
        cgit_commit_link(find_unique_abbrev(oid->hash, DEFAULT_ABBREV), detail,
                         NULL, ctx.qry.head, oid_to_hex(oid), suspect->path);
-       html("</td>\n");
-
+       html("</span>");
        free(detail);
 
-       if (ctx.cfg.enable_tree_linenumbers) {
-               unsigned long lineno = ent->lno;
-               html("<td class='linenumbers'><pre>");
-               while (lineno < ent->lno + ent->num_lines)
-                       htmlf(numberfmt, ++lineno);
-               html("</pre></td>\n");
-       }
+       while (line++ < ent->num_lines)
+               html("\n");
+}
+
+static void emit_blame_entry_linenumber(struct blame_entry *ent)
+{
+       const char *numberfmt = "<a id='n%1$d' href='#n%1$d'>%1$d</a>\n";
+
+       unsigned long lineno = ent->lno;
+       while (lineno < ent->lno + ent->num_lines)
+               htmlf(numberfmt, ++lineno);
+}
+
+static void emit_blame_entry_line(struct blame_scoreboard *sb,
+                                 struct blame_entry *ent)
+{
+       const char *cp, *cpend;
 
        cp = blame_nth_line(sb, ent->lno);
        cpend = blame_nth_line(sb, ent->lno + ent->num_lines);
 
-       html("<td class='lines'><pre><code>");
        html_ntxt(cp, cpend - cp);
-       html("</code></pre></td></tr>\n");
 }
 
 struct walk_tree_context {
@@ -101,7 +105,7 @@ static void print_object(const unsigned char *sha1, const char *path,
        argv_array_push(&rev_argv, "blame");
        argv_array_push(&rev_argv, rev);
        init_revisions(&revs, NULL);
-       DIFF_OPT_SET(&revs.diffopt, ALLOW_TEXTCONV);
+       revs.diffopt.flags.allow_textconv = 1;
        setup_revisions(rev_argv.argc, rev_argv.argv, &revs, NULL);
        init_scoreboard(&sb);
        sb.revs = &revs;
@@ -131,16 +135,44 @@ static void print_object(const unsigned char *sha1, const char *path,
                return;
        }
 
-       html("<table class='blame blob'>");
+       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");
+       }
+
+       /* Lines */
+       html("<td class='lines'>");
        for (ent = sb.ent; ent; ) {
                struct blame_entry *e = ent->next;
-               emit_blame_entry(&sb, ent);
+               html("<div class='alt'><pre><code>");
+               emit_blame_entry_line(&sb, ent);
+               html("</code></pre></div>");
                free(ent);
                ent = e;
        }
-       html("</table>\n");
+       html("</td>\n");
+
        free((void *)sb.final_buf);
 
+       html("</tr>\n</table>\n");
+
        cgit_print_layout_end();
 }