undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blame: simplify 'setup_scoreboard' interface

Browse Source 
The previous commit moved the initialization of 'sb.path' in
'builtin/blame.c::cmd_blame' before the call to
'blame.c::setup_scoreboard'. Since 'cmd_blame' is the only caller of
'setup_scoreboard', it is now unnecessary for 'setup_scoreboard' to
receive 'path' as a separate argument, as 'sb.path' is already
initialized.

Remove this argument from setup_scoreboard's interface and use the
'path' field of the 'sb' 'struct blame_scoreboard' instead.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Philippe Blain 2020-11-01 17:28:46 +00:00 committed by Junio C Hamano
parent 9466e3809d
commit 88894aaeea
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
blame.c
View File

@ -2764,7 +2764,6 @@ void init_scoreboard(struct blame_scoreboard *sb)
} }
void setup_scoreboard(struct blame_scoreboard *sb, void setup_scoreboard(struct blame_scoreboard *sb,
const char *path,
struct blame_origin **orig) struct blame_origin **orig)
{ {
const char *final_commit_name = NULL; const char *final_commit_name = NULL;
@ -2803,7 +2802,7 @@ void setup_scoreboard(struct blame_scoreboard *sb,
setup_work_tree(); setup_work_tree();
sb->final = fake_working_tree_commit(sb->repo, sb->final = fake_working_tree_commit(sb->repo,
&sb->revs->diffopt, &sb->revs->diffopt,
path, sb->contents_from); sb->path, sb->contents_from);
add_pending_object(sb->revs, &(sb->final->object), ":"); add_pending_object(sb->revs, &(sb->final->object), ":");
} }
@ -2846,12 +2845,12 @@ void setup_scoreboard(struct blame_scoreboard *sb,
sb->final_buf_size = o->file.size; sb->final_buf_size = o->file.size;
} }
else { else {
o = get_origin(sb->final, path); o = get_origin(sb->final, sb->path);
if (fill_blob_sha1_and_mode(sb->repo, o)) if (fill_blob_sha1_and_mode(sb->repo, o))
die(_("no such path %s in %s"), path, final_commit_name); die(_("no such path %s in %s"), sb->path, final_commit_name);
if (sb->revs->diffopt.flags.allow_textconv && if (sb->revs->diffopt.flags.allow_textconv &&
textconv_object(sb->repo, path, o->mode, &o->blob_oid, 1, (char **) &sb->final_buf, textconv_object(sb->repo, sb->path, o->mode, &o->blob_oid, 1, (char **) &sb->final_buf,
&sb->final_buf_size)) &sb->final_buf_size))
; ;
else else
@ -2861,7 +2860,7 @@ void setup_scoreboard(struct blame_scoreboard *sb,
if (!sb->final_buf) if (!sb->final_buf)
die(_("cannot read blob %s for path %s"), die(_("cannot read blob %s for path %s"),
oid_to_hex(&o->blob_oid), oid_to_hex(&o->blob_oid),
path); sb->path);
} }
sb->num_read_blob++; sb->num_read_blob++;
prepare_lines(sb); prepare_lines(sb);

1
blame.h
View File

@ -181,7 +181,6 @@ const char *blame_nth_line(struct blame_scoreboard *sb, long lno);
void init_scoreboard(struct blame_scoreboard *sb); void init_scoreboard(struct blame_scoreboard *sb);
void setup_scoreboard(struct blame_scoreboard *sb, void setup_scoreboard(struct blame_scoreboard *sb,
const char *path,
struct blame_origin **orig); struct blame_origin **orig);
void setup_blame_bloom_data(struct blame_scoreboard *sb, void setup_blame_bloom_data(struct blame_scoreboard *sb,
const char *path); const char *path);

2
builtin/blame.c
View File

@ -1087,7 +1087,7 @@ parse_done:
build_ignorelist(&sb, &ignore_revs_file_list, &ignore_rev_list); build_ignorelist(&sb, &ignore_revs_file_list, &ignore_rev_list);
string_list_clear(&ignore_revs_file_list, 0); string_list_clear(&ignore_revs_file_list, 0);
string_list_clear(&ignore_rev_list, 0); string_list_clear(&ignore_rev_list, 0);
setup_scoreboard(&sb, path, &o); setup_scoreboard(&sb, &o);
/* /*
* Changed-path Bloom filters are disabled when looking * Changed-path Bloom filters are disabled when looking