255b78ff52
Update to git version v2.18.0. Required changes follow upstream commits: * Convert find_unique_abbrev* to struct object_id (aab9583f7b5ea5463eb3f653a0b4ecac7539dc94) * sha1_file: convert read_sha1_file to struct object_id (b4f5aca40e6f77cbabcbf4ff003c3cf30a1830c8) * sha1_file: convert sha1_object_info* to object_id (abef9020e3df87c441c9a3a95f592fce5fa49bb9) * object-store: move packed_git and packed_git_mru to object store (a80d72db2a73174b3f22142eb2014b33696fd795) * treewide: rename tree to maybe_tree (891435d55da80ca3654b19834481205be6bdfe33) The changed data types required some of our own functions to be converted to struct object_id: ls_item print_dir print_dir_entry print_object single_tree_cb walk_tree write_tree_link And finally we use new upstream functions that were added for struct object_id: hashcpy -> oidcpy sha1_to_hex -> oid_to_hex Signed-off-by: Christian Hesse <mail@eworm.de> Reviewed-by: John Keeping <john@keeping.me.uk>
302 lignes
7.3 KiB
C
302 lignes
7.3 KiB
C
/* ui-blame.c: functions for blame output
|
|
*
|
|
* Copyright (C) 2006-2017 cgit Development Team <cgit@lists.zx2c4.com>
|
|
*
|
|
* Licensed under GNU General Public License v2
|
|
* (see COPYING for full license text)
|
|
*/
|
|
|
|
#include "cgit.h"
|
|
#include "ui-blame.h"
|
|
#include "html.h"
|
|
#include "ui-shared.h"
|
|
#include "argv-array.h"
|
|
#include "blame.h"
|
|
|
|
|
|
static char *emit_suspect_detail(struct blame_origin *suspect)
|
|
{
|
|
struct commitinfo *info;
|
|
struct strbuf detail = STRBUF_INIT;
|
|
|
|
info = cgit_parse_commit(suspect->commit);
|
|
|
|
strbuf_addf(&detail, "author %s", info->author);
|
|
if (!ctx.cfg.noplainemail)
|
|
strbuf_addf(&detail, " %s", info->author_email);
|
|
strbuf_addf(&detail, " %s\n",
|
|
show_date(info->author_date, info->author_tz,
|
|
cgit_date_mode(DATE_ISO8601)));
|
|
|
|
strbuf_addf(&detail, "committer %s", info->committer);
|
|
if (!ctx.cfg.noplainemail)
|
|
strbuf_addf(&detail, " %s", info->committer_email);
|
|
strbuf_addf(&detail, " %s\n\n",
|
|
show_date(info->committer_date, info->committer_tz,
|
|
cgit_date_mode(DATE_ISO8601)));
|
|
|
|
strbuf_addstr(&detail, info->subject);
|
|
|
|
cgit_free_commitinfo(info);
|
|
return strbuf_detach(&detail, NULL);
|
|
}
|
|
|
|
static void emit_blame_entry_hash(struct blame_entry *ent)
|
|
{
|
|
struct blame_origin *suspect = ent->suspect;
|
|
struct object_id *oid = &suspect->commit->object.oid;
|
|
unsigned long line = 0;
|
|
|
|
char *detail = emit_suspect_detail(suspect);
|
|
html("<span class='sha1'>");
|
|
cgit_commit_link(find_unique_abbrev(oid, DEFAULT_ABBREV), detail,
|
|
NULL, ctx.qry.head, oid_to_hex(oid), suspect->path);
|
|
html("</span>");
|
|
free(detail);
|
|
|
|
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_background(struct blame_scoreboard *sb,
|
|
struct blame_entry *ent)
|
|
{
|
|
unsigned long line;
|
|
size_t len, maxlen = 2;
|
|
const char* pos, *endpos;
|
|
|
|
for (line = ent->lno; line < ent->lno + ent->num_lines; line++) {
|
|
html("\n");
|
|
pos = blame_nth_line(sb, line);
|
|
endpos = blame_nth_line(sb, line + 1);
|
|
len = 0;
|
|
while (pos < endpos) {
|
|
len++;
|
|
if (*pos++ == '\t')
|
|
len = (len + 7) & ~7;
|
|
}
|
|
if (len > maxlen)
|
|
maxlen = len;
|
|
}
|
|
|
|
for (len = 0; len < maxlen - 1; len++)
|
|
html(" ");
|
|
}
|
|
|
|
struct walk_tree_context {
|
|
char *curr_rev;
|
|
int match_baselen;
|
|
int state;
|
|
};
|
|
|
|
static void print_object(const struct object_id *oid, const char *path,
|
|
const char *basename, const char *rev)
|
|
{
|
|
enum object_type type;
|
|
char *buf;
|
|
unsigned long size;
|
|
struct argv_array rev_argv = ARGV_ARRAY_INIT;
|
|
struct rev_info revs;
|
|
struct blame_scoreboard sb;
|
|
struct blame_origin *o;
|
|
struct blame_entry *ent = NULL;
|
|
|
|
type = oid_object_info(the_repository, oid, &size);
|
|
if (type == OBJ_BAD) {
|
|
cgit_print_error_page(404, "Not found", "Bad object name: %s",
|
|
oid_to_hex(oid));
|
|
return;
|
|
}
|
|
|
|
buf = read_object_file(oid, &type, &size);
|
|
if (!buf) {
|
|
cgit_print_error_page(500, "Internal server error",
|
|
"Error reading object %s", oid_to_hex(oid));
|
|
return;
|
|
}
|
|
|
|
argv_array_push(&rev_argv, "blame");
|
|
argv_array_push(&rev_argv, rev);
|
|
init_revisions(&revs, NULL);
|
|
revs.diffopt.flags.allow_textconv = 1;
|
|
setup_revisions(rev_argv.argc, rev_argv.argv, &revs, NULL);
|
|
init_scoreboard(&sb);
|
|
sb.revs = &revs;
|
|
setup_scoreboard(&sb, path, &o);
|
|
o->suspects = blame_entry_prepend(NULL, 0, sb.num_lines, o);
|
|
prio_queue_put(&sb.commits, o->commit);
|
|
blame_origin_decref(o);
|
|
sb.ent = NULL;
|
|
sb.path = path;
|
|
assign_blame(&sb, 0);
|
|
blame_sort_final(&sb);
|
|
blame_coalesce(&sb);
|
|
|
|
cgit_set_title_from_path(path);
|
|
|
|
cgit_print_layout_start();
|
|
htmlf("blob: %s (", oid_to_hex(oid));
|
|
cgit_plain_link("plain", NULL, NULL, ctx.qry.head, rev, path);
|
|
html(") (");
|
|
cgit_tree_link("tree", NULL, NULL, ctx.qry.head, rev, path);
|
|
html(")\n");
|
|
|
|
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>",
|
|
size / 1024, ctx.cfg.max_blob_size);
|
|
goto cleanup;
|
|
}
|
|
|
|
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");
|
|
}
|
|
|
|
html("<td class='lines'><div>");
|
|
|
|
/* Colored bars behind lines */
|
|
html("<div>");
|
|
for (ent = sb.ent; ent; ) {
|
|
struct blame_entry *e = ent->next;
|
|
html("<div class='alt'><pre>");
|
|
emit_blame_entry_line_background(&sb, ent);
|
|
html("</pre></div>");
|
|
free(ent);
|
|
ent = e;
|
|
}
|
|
html("</div>");
|
|
|
|
free((void *)sb.final_buf);
|
|
|
|
/* Lines */
|
|
html("<pre><code>");
|
|
if (ctx.repo->source_filter) {
|
|
char *filter_arg = xstrdup(basename);
|
|
cgit_open_filter(ctx.repo->source_filter, filter_arg);
|
|
html_raw(buf, size);
|
|
cgit_close_filter(ctx.repo->source_filter);
|
|
free(filter_arg);
|
|
} else {
|
|
html_txt(buf);
|
|
}
|
|
html("</code></pre>");
|
|
|
|
html("</div></td>\n");
|
|
|
|
html("</tr>\n</table>\n");
|
|
|
|
cgit_print_layout_end();
|
|
|
|
cleanup:
|
|
free(buf);
|
|
}
|
|
|
|
static int walk_tree(const struct object_id *oid, struct strbuf *base,
|
|
const char *pathname, unsigned mode, int stage,
|
|
void *cbdata)
|
|
{
|
|
struct walk_tree_context *walk_tree_ctx = cbdata;
|
|
|
|
if (base->len == walk_tree_ctx->match_baselen) {
|
|
if (S_ISREG(mode)) {
|
|
struct strbuf buffer = STRBUF_INIT;
|
|
strbuf_addbuf(&buffer, base);
|
|
strbuf_addstr(&buffer, pathname);
|
|
print_object(oid, buffer.buf, pathname,
|
|
walk_tree_ctx->curr_rev);
|
|
strbuf_release(&buffer);
|
|
walk_tree_ctx->state = 1;
|
|
} else if (S_ISDIR(mode)) {
|
|
walk_tree_ctx->state = 2;
|
|
}
|
|
} else if (base->len < INT_MAX
|
|
&& (int)base->len > walk_tree_ctx->match_baselen) {
|
|
walk_tree_ctx->state = 2;
|
|
} else if (S_ISDIR(mode)) {
|
|
return READ_TREE_RECURSIVE;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int basedir_len(const char *path)
|
|
{
|
|
char *p = strrchr(path, '/');
|
|
if (p)
|
|
return p - path + 1;
|
|
return 0;
|
|
}
|
|
|
|
void cgit_print_blame(void)
|
|
{
|
|
const char *rev = ctx.qry.sha1;
|
|
struct object_id oid;
|
|
struct commit *commit;
|
|
struct pathspec_item path_items = {
|
|
.match = ctx.qry.path,
|
|
.len = ctx.qry.path ? strlen(ctx.qry.path) : 0
|
|
};
|
|
struct pathspec paths = {
|
|
.nr = 1,
|
|
.items = &path_items
|
|
};
|
|
struct walk_tree_context walk_tree_ctx = {
|
|
.state = 0
|
|
};
|
|
|
|
if (!rev)
|
|
rev = ctx.qry.head;
|
|
|
|
if (get_oid(rev, &oid)) {
|
|
cgit_print_error_page(404, "Not found",
|
|
"Invalid revision name: %s", rev);
|
|
return;
|
|
}
|
|
commit = lookup_commit_reference(&oid);
|
|
if (!commit || parse_commit(commit)) {
|
|
cgit_print_error_page(404, "Not found",
|
|
"Invalid commit reference: %s", rev);
|
|
return;
|
|
}
|
|
|
|
walk_tree_ctx.curr_rev = xstrdup(rev);
|
|
walk_tree_ctx.match_baselen = (path_items.match) ?
|
|
basedir_len(path_items.match) : -1;
|
|
|
|
read_tree_recursive(commit->maybe_tree, "", 0, 0, &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)
|
|
cgit_print_error_page(404, "No blame for folders",
|
|
"Blame is not available for folders.");
|
|
|
|
free(walk_tree_ctx.curr_rev);
|
|
}
|