git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff Smith <whydoubt@gmail.com>
Cc: git@vger.kernel.org, peff@peff.net
Subject: Re: [PATCH 28/29] blame: move scoreboard setup to libgit
Date: Thu, 25 May 2017 14:53:57 +0900	[thread overview]
Message-ID: <xmqqfufteb2i.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170524051537.29978-29-whydoubt@gmail.com> (Jeff Smith's message of "Wed, 24 May 2017 00:15:36 -0500")

Jeff Smith <whydoubt@gmail.com> writes:

> Signed-off-by: Jeff Smith <whydoubt@gmail.com>
> ---
>  blame.c         | 279 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
>  blame.h         |  10 +-
>  builtin/blame.c | 276 -------------------------------------------------------
>  3 files changed, 281 insertions(+), 284 deletions(-)
>
> ...
> +static struct commit *find_single_initial(struct rev_info *revs,
> +					  const char **name_p)
> +{
> +	int i;
> +	struct commit *found = NULL;
> +	const char *name = NULL;
> +
> +	/*
> +	 * There must be one and only one negative commit, and it must be
> +	 * the boundary.
> +	 */
> +	for (i = 0; i < revs->pending.nr; i++) {
> +		struct object *obj = revs->pending.objects[i].item;
> +		if (!(obj->flags & UNINTERESTING))
> +			continue;
> +		obj = deref_tag(obj, NULL, 0);
> +		if (obj->type != OBJ_COMMIT)
> +			die("Non commit %s?", revs->pending.objects[i].name);
> +		if (found)
> +			die("More than one commit to dig up from, %s and %s?",
> +			    revs->pending.objects[i].name, name);
> +		found = (struct commit *) obj;
> +		name = revs->pending.objects[i].name;
> +	}
> +
> +	if (!name)
> +		found = dwim_reverse_initial(revs, &name);
> +	if (!name)
> +		die("No commit to dig up from?");
> +
> +	if (name_p)
> +		*name_p = name;
> +	return found;
> +}
> +...
> -static struct commit *find_single_initial(struct rev_info *revs,
> -					  const char **name_p)
> -{
> -	int i;
> -	const char *final_commit_name = NULL;
> -	struct commit *found = NULL;
> -
> -...
> -
> -	if (!final_commit_name)
> -		found = dwim_reverse_initial(revs, &final_commit_name);
> -	if (!final_commit_name)
> -		die("No commit to dig up from?");
> -
> -	if (name_p)
> -		*name_p = final_commit_name;
> -	return found;
> -}


In a patch whose primary purpose is to move code between files,
making what used to be public to static and vice versa is an
integral part of moving code.  That is why we want to see a patch
organized in such a way that comparing the lines that are lost from
builtin/blame.c and the lines that are added to blame.[ch] is made
easy.

And from that point of view, it was somewhat irritating to find this
kind of meaningless change.  If you didn't like the name of the
variable "final-commit-name", that shold have been renamed while the
code was still in builtin/blame.c

The end result looks OK anyway (I've checked 29/29 as well).

Thanks.



  reply	other threads:[~2017-05-25  5:54 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
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 [this message]
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=xmqqfufteb2i.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).