git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lucian Poston <lucian.poston@gmail.com>
To: git@vger.kernel.org
Cc: Lucian Poston <lucian.poston@gmail.com>
Subject: [PATCH v3 2/7] Add output_prefix_length to diff_options
Date: Mon, 16 Apr 2012 03:44:50 -0700	[thread overview]
Message-ID: <1334573095-32286-3-git-send-email-lucian.poston@gmail.com> (raw)
In-Reply-To: <1334573095-32286-1-git-send-email-lucian.poston@gmail.com>

Add output_prefix_length to diff_options. Initialize the value to 0 and only
set it when graph.c:diff_output_prefix_callback() is called.

Signed-off-by: Lucian Poston <lucian.poston@gmail.com>
---
 diff.h  |    1 +
 graph.c |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/diff.h b/diff.h
index cb68743..19d762f 100644
--- a/diff.h
+++ b/diff.h
@@ -150,6 +150,7 @@ struct diff_options {
 	diff_format_fn_t format_callback;
 	void *format_callback_data;
 	diff_prefix_fn_t output_prefix;
+	int output_prefix_length;
 	void *output_prefix_data;
 };
 
diff --git a/graph.c b/graph.c
index 7358416..7e0a099 100644
--- a/graph.c
+++ b/graph.c
@@ -194,8 +194,10 @@ static struct strbuf *diff_output_prefix_callback(struct diff_options *opt, void
 	struct git_graph *graph = data;
 	static struct strbuf msgbuf = STRBUF_INIT;
 
+	assert(opt);
 	assert(graph);
 
+	opt->output_prefix_length = graph->width;
 	strbuf_reset(&msgbuf);
 	graph_padding_line(graph, &msgbuf);
 	return &msgbuf;
@@ -245,6 +247,7 @@ struct git_graph *graph_init(struct rev_info *opt)
 	 */
 	opt->diffopt.output_prefix = diff_output_prefix_callback;
 	opt->diffopt.output_prefix_data = graph;
+	opt->diffopt.output_prefix_length = 0;
 
 	return graph;
 }
-- 
1.7.3.4

  parent reply	other threads:[~2012-04-16 10:46 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-16 10:44 [PATCH v3 0/7] diff stat calculation adjustments Lucian Poston
2012-04-16 10:44 ` [PATCH v3 1/7] t4052: test --stat output with --graph Lucian Poston
2012-04-16 10:44 ` Lucian Poston [this message]
2012-04-16 18:48   ` [PATCH v3 2/7] Add output_prefix_length to diff_options Junio C Hamano
2012-04-18  2:31     ` Lucian Poston
2012-04-16 10:44 ` [PATCH v3 3/7] Adjust stat width calculations to take --graph output into account Lucian Poston
2012-04-16 10:44 ` [PATCH v3 4/7] t4052: Adjust --graph --stat output for prefixes Lucian Poston
2012-04-16 18:48   ` Junio C Hamano
2012-04-18  2:23     ` Lucian Poston
2012-04-16 10:44 ` [PATCH v3 5/7] t4052: Add tests to illustrate issues with restrictive COLUMNS Lucian Poston
2012-04-16 18:48   ` Junio C Hamano
2012-04-18  2:31     ` Lucian Poston
2012-04-16 10:44 ` [PATCH v3 6/7] Prevent graph_width of diff stat from falling below min Lucian Poston
2012-04-16 10:44 ` [PATCH v3 7/7] t4052: Adjust --stat output for minimum graph_width Lucian Poston
2012-04-16 19:30 ` [PATCH v3 0/7] diff stat calculation adjustments 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=1334573095-32286-3-git-send-email-lucian.poston@gmail.com \
    --to=lucian.poston@gmail.com \
    --cc=git@vger.kernel.org \
    /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 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 NNTP newsgroup(s).