All of lore.kernel.org
 help / color / mirror / Atom feed
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 12/29] blame: move contents_from to scoreboard
Date: Wed, 24 May 2017 00:15:20 -0500	[thread overview]
Message-ID: <20170524051537.29978-13-whydoubt@gmail.com> (raw)
In-Reply-To: <20170524051537.29978-1-whydoubt@gmail.com>

The argument from --contents is used in parts of blame that are being
moved to libgit, and should be accessible via the scoreboard structure.

Signed-off-by: Jeff Smith <whydoubt@gmail.com>
---
 builtin/blame.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/builtin/blame.c b/builtin/blame.c
index 643f847..0955fc1 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -378,6 +378,9 @@ struct blame_scoreboard {
 	 */
 	unsigned move_score;
 	unsigned copy_score;
+
+	/* use this file's contents as the final image */
+	const char *contents_from;
 };
 
 static void sanity_check_refcnt(struct blame_scoreboard *);
@@ -2735,6 +2738,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 	sb.copy_score = BLAME_DEFAULT_COPY_SCORE;
 
 	sb.revs = &revs;
+	sb.contents_from = contents_from;
 	if (!reverse) {
 		final_commit_name = prepare_final(&sb);
 		sb.commits.compare = compare_commits_by_commit_date;
-- 
2.9.3


  parent reply	other threads:[~2017-05-24  5: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 ` Jeff Smith [this message]
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
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170524051537.29978-13-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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.