| @@ -67,15 +67,29 @@ static void emit_blame_entry_linenumber(struct blame_entry *ent) · 66 unmodified lines |
| 67 | 67 | htmlf(numberfmt, ++lineno); |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | | −static void emit_blame_entry_line(struct blame_scoreboard *sb, |
| 71 | | − struct blame_entry *ent) |
| 70 | +static void emit_blame_entry_line_background(struct blame_scoreboard *sb, |
| 71 | + struct blame_entry *ent) |
| 72 | 72 | { |
| 73 | | − const char *cp, *cpend; |
| 73 | + unsigned long line; |
| 74 | + size_t len, maxlen = 2; |
| 75 | + const char* pos, *endpos; |
| 74 | 76 | |
| 75 | | − cp = blame_nth_line(sb, ent->lno); |
| 76 | | − cpend = blame_nth_line(sb, ent->lno + ent->num_lines); |
| 77 | + for (line = ent->lno; line < ent->lno + ent->num_lines; line++) { |
| 78 | + html("\n"); |
| 79 | + pos = blame_nth_line(sb, line); |
| 80 | + endpos = blame_nth_line(sb, line + 1); |
| 81 | + len = 0; |
| 82 | + while (pos < endpos) { |
| 83 | + len++; |
| 84 | + if (*pos++ == '\t') |
| 85 | + len = (len + 7) & ~7; |
| 86 | + } |
| 87 | + if (len > maxlen) |
| 88 | + maxlen = len; |
| 89 | + } |
| 77 | 90 | |
| 78 | | − html_ntxt(cp, cpend - cp); |
| 91 | + for (len = 0; len < maxlen - 1; len++) |
| 92 | + html(" "); |
| 79 | 93 | } |
| 80 | 94 | |
| 81 | 95 | struct walk_tree_context { |
| @@ -88,6 +102,7 @@ static void print_object(const unsigned char *sha1, const char *path, · 6 unmodified lines |
| 88 | 102 | const char *basename, const char *rev) |
| 89 | 103 | { |
| 90 | 104 | enum object_type type; |
| 105 | + char *buf; |
| 91 | 106 | unsigned long size; |
| 92 | 107 | struct argv_array rev_argv = ARGV_ARRAY_INIT; |
| 93 | 108 | struct rev_info revs; |
| @@ -102,6 +117,13 @@ static void print_object(const unsigned char *sha1, const char *path, · 8 unmodified lines |
| 102 | 117 | return; |
| 103 | 118 | } |
| 104 | 119 | |
| 120 | + buf = read_sha1_file(sha1, &type, &size); |
| 121 | + if (!buf) { |
| 122 | + cgit_print_error_page(500, "Internal server error", |
| 123 | + "Error reading object %s", sha1_to_hex(sha1)); |
| 124 | + return; |
| 125 | + } |
| 126 | + |
| 105 | 127 | argv_array_push(&rev_argv, "blame"); |
| 106 | 128 | argv_array_push(&rev_argv, rev); |
| 107 | 129 | init_revisions(&revs, NULL); |
| @@ -157,20 +179,37 @@ static void print_object(const unsigned char *sha1, const char *path, · 49 unmodified lines |
| 157 | 179 | html("</td>\n"); |
| 158 | 180 | } |
| 159 | 181 | |
| 160 | | − /* Lines */ |
| 161 | | − html("<td class='lines'>"); |
| 182 | + html("<td class='lines'><div>"); |
| 183 | + |
| 184 | + /* Colored bars behind lines */ |
| 185 | + html("<div>"); |
| 162 | 186 | for (ent = sb.ent; ent; ) { |
| 163 | 187 | struct blame_entry *e = ent->next; |
| 164 | | − html("<div class='alt'><pre><code>"); |
| 165 | | − emit_blame_entry_line(&sb, ent); |
| 166 | | − html("</code></pre></div>"); |
| 188 | + html("<div class='alt'><pre>"); |
| 189 | + emit_blame_entry_line_background(&sb, ent); |
| 190 | + html("</pre></div>"); |
| 167 | 191 | free(ent); |
| 168 | 192 | ent = e; |
| 169 | 193 | } |
| 170 | | − html("</td>\n"); |
| 194 | + html("</div>"); |
| 171 | 195 | |
| 172 | 196 | free((void *)sb.final_buf); |
| 173 | 197 | |
| 198 | + /* Lines */ |
| 199 | + html("<pre><code>"); |
| 200 | + if (ctx.repo->source_filter) { |
| 201 | + char *filter_arg = xstrdup(basename); |
| 202 | + cgit_open_filter(ctx.repo->source_filter, filter_arg); |
| 203 | + html_raw(buf, size); |
| 204 | + cgit_close_filter(ctx.repo->source_filter); |
| 205 | + free(filter_arg); |
| 206 | + } else { |
| 207 | + html_txt(buf); |
| 208 | + } |
| 209 | + html("</code></pre>"); |
| 210 | + |
| 211 | + html("</div></td>\n"); |
| 212 | + |
| 174 | 213 | html("</tr>\n</table>\n"); |
| 175 | 214 | |
| 176 | 215 | cgit_print_layout_end(); |