From: Kumar Appaiah <a.kumar@alumni.iitm.ac.in>
To: Jonas Fonseca <jonas.fonseca@gmail.com>, git@vger.kernel.org
Cc: Kumar Appaiah <a.kumar@alumni.iitm.ac.in>
Subject: [tig] [PATCH 2/3] diff: Move diff stat drawing to a common function
Date: Fri, 11 Apr 2014 08:20:04 -0400 [thread overview]
Message-ID: <1397218805-2560-3-git-send-email-a.kumar@alumni.iitm.ac.in> (raw)
In-Reply-To: <1397218805-2560-1-git-send-email-a.kumar@alumni.iitm.ac.in>
Signed-off-by: Kumar Appaiah <a.kumar@alumni.iitm.ac.in>
---
include/tig/diff.h | 1 +
src/diff.c | 30 ++++++++++++++++++------------
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/include/tig/diff.h b/include/tig/diff.h
index ba40386..16299fe 100644
--- a/include/tig/diff.h
+++ b/include/tig/diff.h
@@ -28,6 +28,7 @@ bool diff_common_read(struct view *view, const char *data, struct diff_state *st
bool diff_common_draw(struct view *view, struct line *line, unsigned int lineno);
enum request diff_common_enter(struct view *view, enum request request, struct line *line);
bool diff_common_add_diff_stat(struct view *view, const char *data);
+void diff_common_draw_diff_stat(struct view *view, enum line_type *type, char **text);
unsigned int diff_get_lineno(struct view *view, struct line *line);
const char *diff_get_pathname(struct view *view, struct line *line);
diff --git a/src/diff.c b/src/diff.c
index 1daf8fa..b204bab 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -167,6 +167,23 @@ diff_common_draw_part(struct view *view, enum line_type *type, char **text, char
return sep != NULL;
}
+void
+diff_common_draw_diff_stat(struct view *view, enum line_type *type, char **text)
+{
+ diff_common_draw_part(view, type, text, '|', LINE_DEFAULT);
+ if (diff_common_draw_part(view, type, text, 'B', LINE_DEFAULT)) {
+ /* Handle binary diffstat: Bin <deleted> -> <added> bytes */
+ diff_common_draw_part(view, type, text, ' ', LINE_DIFF_DEL);
+ diff_common_draw_part(view, type, text, '-', LINE_DEFAULT);
+ diff_common_draw_part(view, type, text, ' ', LINE_DIFF_ADD);
+ diff_common_draw_part(view, type, text, 'b', LINE_DEFAULT);
+
+ } else {
+ diff_common_draw_part(view, type, text, '+', LINE_DIFF_ADD);
+ diff_common_draw_part(view, type, text, '-', LINE_DIFF_DEL);
+ }
+}
+
bool
diff_common_draw(struct view *view, struct line *line, unsigned int lineno)
{
@@ -180,18 +197,7 @@ diff_common_draw(struct view *view, struct line *line, unsigned int lineno)
return TRUE;
if (type == LINE_DIFF_STAT) {
- diff_common_draw_part(view, &type, &text, '|', LINE_DEFAULT);
- if (diff_common_draw_part(view, &type, &text, 'B', LINE_DEFAULT)) {
- /* Handle binary diffstat: Bin <deleted> -> <added> bytes */
- diff_common_draw_part(view, &type, &text, ' ', LINE_DIFF_DEL);
- diff_common_draw_part(view, &type, &text, '-', LINE_DEFAULT);
- diff_common_draw_part(view, &type, &text, ' ', LINE_DIFF_ADD);
- diff_common_draw_part(view, &type, &text, 'b', LINE_DEFAULT);
-
- } else {
- diff_common_draw_part(view, &type, &text, '+', LINE_DIFF_ADD);
- diff_common_draw_part(view, &type, &text, '-', LINE_DIFF_DEL);
- }
+ diff_common_draw_diff_stat(view, &type, &text);
}
if (line->user_flags & DIFF_LINE_COMMIT_TITLE)
--
1.9.1
next prev parent reply other threads:[~2014-04-11 12:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-11 12:20 [tig] [PATCH 0/3] log: colour the diffstat Kumar Appaiah
2014-04-11 12:20 ` [tig] [PATCH 1/3] diff: Move diff stat addition to a common function Kumar Appaiah
2014-04-11 12:20 ` Kumar Appaiah [this message]
2014-04-11 12:20 ` [tig] [PATCH 3/3] log: Colour the diff stat Kumar Appaiah
2014-04-13 21:54 ` [tig] [PATCHv2 0/3] log: colour the diffstat Kumar Appaiah
2014-04-13 21:54 ` [tig] [PATCHv2 1/3] diff: Move diff stat addition to a common function Kumar Appaiah
2014-04-13 21:54 ` [tig] [PATCHv2 2/3] diff: Move diff stat drawing " Kumar Appaiah
2014-04-13 21:54 ` [tig] [PATCHv2 3/3] log: Colour the diff stat Kumar Appaiah
2014-04-17 0:44 ` Jonas Fonseca
2014-04-17 1:04 ` Kumar Appaiah
2014-04-17 0:52 ` [tig] [PATCHv2 0/3] log: colour the diffstat Jonas Fonseca
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=1397218805-2560-3-git-send-email-a.kumar@alumni.iitm.ac.in \
--to=a.kumar@alumni.iitm.ac.in \
--cc=git@vger.kernel.org \
--cc=jonas.fonseca@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.
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).