From: Junio C Hamano <gitster@pobox.com>
To: Jeff Smith <whydoubt@gmail.com>
Cc: git@vger.kernel.org, peff@peff.net
Subject: Re: [PATCH 18/29] blame: move progess updates to a scoreboard callback
Date: Thu, 25 May 2017 13:16:12 +0900 [thread overview]
Message-ID: <xmqq1srdfu5v.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170524051537.29978-19-whydoubt@gmail.com> (Jeff Smith's message of "Wed, 24 May 2017 00:15:26 -0500")
Jeff Smith <whydoubt@gmail.com> writes:
> Subject: Re: [PATCH 18/29] blame: move progess updates to a scoreboard callback
s/progess/progress/ (I can do this on my end).
> 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(-)
>
> -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;
>
This hunk is interesting. The function not only does the "progress"
eye candy, but it actually handles the "--incremental" option.
Anybody who wants to do something similar using the libified blame
needs to implement it in their found_guilty callback like this one
does, which is probably a good division of labor between the blame
lib and the front-end (which builtin/blame.c is one instance of).
> @@ -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);
And this piece (and matching "stop progress" at the end of the
function) is now the responsibility of the caller, which makes
sense.
>
> + 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();
Very nicely done so far.
next prev parent reply other threads:[~2017-05-25 4:16 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 ` [PATCH 18/29] blame: move progess updates to a scoreboard callback Jeff Smith
2017-05-25 4:16 ` Junio C Hamano [this message]
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=xmqq1srdfu5v.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=whydoubt@gmail.com \
/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).