From: Bo Yang <struggleyb.nku@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, trast@student.ethz.ch, peff@peff.net
Subject: [PATCH 4/6 v3] Emit a whole line once a time.
Date: Thu, 20 May 2010 18:52:42 -0700 [thread overview]
Message-ID: <1274406764-32278-5-git-send-email-struggleyb.nku@gmail.com> (raw)
In-Reply-To: <1274406764-32278-4-git-send-email-struggleyb.nku@gmail.com>
Use a strbuf to compose the whole line, and then
call emit_line to output it once. This make output_prefix
callback works well.
Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
---
diff.c | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/diff.c b/diff.c
index b935e1a..ea737e9 100644
--- a/diff.c
+++ b/diff.c
@@ -370,6 +370,18 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
static const char atat[2] = { '@', '@' };
const char *cp, *ep;
+ struct strbuf msgbuf = STRBUF_INIT;
+ int org_len = len;
+
+ /*
+ * trailing \r\n
+ */
+ int i = 1;
+ for (; i < 3; i++) {
+ if (line[len - i] == '\r' || line[len - i] == '\n') {
+ len --;
+ }
+ }
/*
* As a hunk header must begin with "@@ -<old>, +<new> @@",
@@ -384,17 +396,29 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
ep += 2; /* skip over @@ */
/* The hunk header in fraginfo color */
- emit_line(ecbdata->opt, frag, reset, line, ep - line);
+ strbuf_add(&msgbuf, frag, strlen(frag));
+ strbuf_add(&msgbuf, line, ep - line);
+ strbuf_add(&msgbuf, reset, strlen(reset));
/* blank before the func header */
for (cp = ep; ep - line < len; ep++)
if (*ep != ' ' && *ep != '\t')
break;
- if (ep != cp)
- emit_line(ecbdata->opt, plain, reset, cp, ep - cp);
+ if (ep != cp) {
+ strbuf_add(&msgbuf, plain, strlen(plain));
+ strbuf_add(&msgbuf, cp, ep - cp);
+ strbuf_add(&msgbuf, reset, strlen(reset));
+ }
+
+ if (ep < line + len) {
+ strbuf_add(&msgbuf, func, strlen(func));
+ strbuf_add(&msgbuf, ep, line + len - ep);
+ strbuf_add(&msgbuf, reset, strlen(reset));
+ }
- if (ep < line + len)
- emit_line(ecbdata->opt, func, reset, ep, line + len - ep);
+ strbuf_add(&msgbuf, line + len, org_len - len);
+ emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
+ strbuf_release(&msgbuf);
}
static struct diff_tempfile *claim_diff_tempfile(void) {
--
1.6.0.4
next prev parent reply other threads:[~2010-05-21 1:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-21 1:52 [PATCH 0/6 v3] Make git log --graph looks better with -p and other diff options Bo Yang
2010-05-21 1:52 ` [PATCH 1/6 v3] Add a prefix output callback to diff output Bo Yang
2010-05-21 1:52 ` [PATCH 2/6 v3] Output the graph columns at the end of the commit message Bo Yang
2010-05-21 1:52 ` [PATCH 3/6 v3] diff.c: Output the text graph padding before each diff line Bo Yang
2010-05-21 1:52 ` Bo Yang [this message]
2010-05-21 1:52 ` [PATCH 5/6 v3] Register a callback for graph output Bo Yang
2010-05-21 1:52 ` [PATCH 6/6 v3] Make --color-words work well with --graph Bo Yang
2010-05-21 3:50 ` [PATCH 0/6 v3] Make git log --graph looks better with -p and other diff options Jeff King
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=1274406764-32278-5-git-send-email-struggleyb.nku@gmail.com \
--to=struggleyb.nku@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=trast@student.ethz.ch \
/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).