From: Jeff Smith <whydoubt@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, Jeff Smith <whydoubt@gmail.com>
Subject: [PATCH 18/29] blame: move progess updates to a scoreboard callback
Date: Wed, 24 May 2017 00:15:26 -0500 [thread overview]
Message-ID: <20170524051537.29978-19-whydoubt@gmail.com> (raw)
In-Reply-To: <20170524051537.29978-1-whydoubt@gmail.com>
Allow the interface user to decide how to handle a progress update.
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
---
builtin/blame.c | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c
index 1b53325..d05907b 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -391,6 +391,9 @@ struct blame_scoreboard {
/* callbacks */
void(*on_sanity_fail)(struct blame_scoreboard *, int);
+ void(*found_guilty_entry)(struct blame_entry *, void *);
+
+ void *found_guilty_entry_data;
};
static void sanity_check_refcnt(struct blame_scoreboard *);
@@ -1729,9 +1732,10 @@ static int emit_one_suspect_detail(struct blame_origin *suspect, int repeat)
* The blame_entry is found to be guilty for the range.
* Show it in incremental output.
*/
-static void found_guilty_entry(struct blame_entry *ent,
- struct progress_info *pi)
+static void found_guilty_entry(struct blame_entry *ent, void *data)
{
+ struct progress_info *pi = (struct progress_info *)data;
+
if (incremental) {
struct blame_origin *suspect = ent->suspect;
@@ -1754,11 +1758,6 @@ static void assign_blame(struct blame_scoreboard *sb, int opt)
{
struct rev_info *revs = sb->revs;
struct commit *commit = prio_queue_get(&sb->commits);
- struct progress_info pi = { NULL, 0 };
-
- if (show_progress)
- pi.progress = start_progress_delay(_("Blaming lines"),
- sb->num_lines, 50, 1);
while (commit) {
struct blame_entry *ent;
@@ -1800,7 +1799,8 @@ static void assign_blame(struct blame_scoreboard *sb, int opt)
suspect->guilty = 1;
for (;;) {
struct blame_entry *next = ent->next;
- found_guilty_entry(ent, &pi);
+ if (sb->found_guilty_entry)
+ sb->found_guilty_entry(ent, sb->found_guilty_entry_data);
if (next) {
ent = next;
continue;
@@ -1816,8 +1816,6 @@ static void assign_blame(struct blame_scoreboard *sb, int opt)
if (sb->debug) /* sanity */
sanity_check_refcnt(sb);
}
-
- stop_progress(&pi.progress);
}
static const char *format_time(timestamp_t time, const char *tz_str,
@@ -2550,6 +2548,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
char *final_commit_name = NULL;
enum object_type type;
struct commit *final_commit = NULL;
+ struct progress_info pi = { NULL, 0 };
struct string_list range_list = STRING_LIST_INIT_NODUP;
int output_option = 0, opt = 0;
@@ -2905,8 +2904,16 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
read_mailmap(&mailmap, NULL);
+ sb.found_guilty_entry = &found_guilty_entry;
+ sb.found_guilty_entry_data = π
+ if (show_progress)
+ pi.progress = start_progress_delay(_("Blaming lines"),
+ sb.num_lines, 50, 1);
+
assign_blame(&sb, opt);
+ stop_progress(&pi.progress);
+
if (!incremental)
setup_pager();
--
2.9.3
next prev parent reply other threads:[~2017-05-24 5:17 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-24 5:15 [PATCH 00/29] Add blame to libgit Jeff Smith
2017-05-24 5:15 ` [PATCH 01/29] blame: remove unneeded dependency on blob.h Jeff Smith
2017-05-24 5:15 ` [PATCH 02/29] blame: move textconv_object with related functions Jeff Smith
2017-05-24 5:15 ` [PATCH 03/29] blame: remove unused parameters Jeff Smith
2017-05-24 5:15 ` [PATCH 04/29] blame: rename origin structure to blame_origin Jeff Smith
2017-05-24 5:15 ` [PATCH 05/29] blame: rename scoreboard structure to blame_scoreboard Jeff Smith
2017-05-24 5:15 ` [PATCH 06/29] blame: rename origin-related functions Jeff Smith
2017-05-24 5:15 ` [PATCH 07/29] blame: rename coalesce function Jeff Smith
2017-05-24 5:15 ` [PATCH 08/29] blame: rename ent_score function Jeff Smith
2017-05-24 5:15 ` [PATCH 09/29] blame: rename nth_line function Jeff Smith
2017-05-24 5:15 ` [PATCH 10/29] blame: move stat counters to scoreboard Jeff Smith
2017-05-24 5:15 ` [PATCH 11/29] blame: move copy/move thresholds " Jeff Smith
2017-05-24 5:15 ` [PATCH 12/29] blame: move contents_from " Jeff Smith
2017-05-24 5:15 ` [PATCH 13/29] blame: move reverse flag " Jeff Smith
2017-05-24 5:15 ` [PATCH 14/29] blame: move show_root " Jeff Smith
2017-05-24 5:15 ` [PATCH 15/29] blame: move xdl_opts flags " Jeff Smith
2017-05-24 5:15 ` [PATCH 16/29] blame: move no_whole_file_rename flag " Jeff Smith
2017-05-24 5:15 ` [PATCH 17/29] blame: make sanity_check use a callback in scoreboard Jeff Smith
2017-05-24 5:15 ` Jeff Smith [this message]
2017-05-25 4:16 ` [PATCH 18/29] blame: move progess updates to a scoreboard callback Junio C Hamano
2017-05-24 5:15 ` [PATCH 19/29] blame: wrap blame_sort and compare_blame_final Jeff Smith
2017-05-24 5:15 ` [PATCH 20/29] blame: rework methods that determine 'final' commit Jeff Smith
2017-05-25 4:59 ` Junio C Hamano
2017-05-24 5:15 ` [PATCH 21/29] blame: create scoreboard init function Jeff Smith
2017-05-24 5:15 ` [PATCH 22/29] blame: create scoreboard setup function Jeff Smith
2017-05-25 5:15 ` Junio C Hamano
2017-05-24 5:15 ` [PATCH 23/29] blame: create entry prepend function Jeff Smith
2017-05-25 5:21 ` Junio C Hamano
2017-05-24 5:15 ` [PATCH 24/29] blame: move core structures to header Jeff Smith
2017-05-25 5:25 ` Junio C Hamano
2017-05-24 5:15 ` [PATCH 25/29] blame: move origin-related methods to libgit Jeff Smith
2017-05-24 5:15 ` [PATCH 26/29] blame: move fake-commit-related " Jeff Smith
2017-05-24 5:15 ` [PATCH 27/29] blame: move scoreboard-related " Jeff Smith
2017-05-24 5:15 ` [PATCH 28/29] blame: move scoreboard setup " Jeff Smith
2017-05-25 5:53 ` Junio C Hamano
2017-05-25 12:56 ` Jeffrey Smith
2017-05-24 5:15 ` [PATCH 29/29] blame: move entry prepend " Jeff Smith
2017-05-24 7:08 ` [PATCH 00/29] Add blame " Junio C Hamano
2017-05-25 5:55 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170524051537.29978-19-whydoubt@gmail.com \
--to=whydoubt@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).