From: Stefan Beller <sbeller@google.com>
To: sbeller@google.com
Cc: bmwill@google.com, git@vger.kernel.org, gitster@pobox.com,
jonathantanmy@google.com, jrnieder@gmail.com,
mhagger@alum.mit.edu, peff@peff.net, philipoakley@iee.org
Subject: [PATCH 18/26] diff.c: convert word diffing to use emit_diff_symbol
Date: Mon, 19 Jun 2017 19:48:08 -0700 [thread overview]
Message-ID: <20170620024816.20021-19-sbeller@google.com> (raw)
In-Reply-To: <20170620024816.20021-1-sbeller@google.com>
The word diffing is not line oriented and would need some serious
effort to be transformed into a line oriented approach, so
just go with a symbol DIFF_SYMBOL_WORD_DIFF that is a partial line.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
diff.c | 79 ++++++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 46 insertions(+), 33 deletions(-)
diff --git a/diff.c b/diff.c
index 0a5ff2500f..5b46baa12a 100644
--- a/diff.c
+++ b/diff.c
@@ -590,6 +590,7 @@ enum diff_symbol {
DIFF_SYMBOL_STATS_SUMMARY_ABBREV,
DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
DIFF_SYMBOL_STATS_LINE,
+ DIFF_SYMBOL_WORD_DIFF,
};
/*
* Flags for content lines:
@@ -772,6 +773,9 @@ static void emit_diff_symbol(struct diff_options *o, enum diff_symbol s,
case DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES:
emit_line(o, "", "", line, len);
break;
+ case DIFF_SYMBOL_WORD_DIFF:
+ fprintf(o->file, "%.*s", len, line);
+ break;
default:
die("BUG: unknown diff symbol");
}
@@ -1100,37 +1104,49 @@ struct diff_words_data {
struct diff_words_style *style;
};
-static int fn_out_diff_words_write_helper(FILE *fp,
+static int fn_out_diff_words_write_helper(struct diff_options *o,
struct diff_words_style_elem *st_el,
const char *newline,
- size_t count, const char *buf,
- const char *line_prefix)
+ size_t count, const char *buf)
{
int print = 0;
+ struct strbuf sb = STRBUF_INIT;
while (count) {
char *p = memchr(buf, '\n', count);
if (print)
- fputs(line_prefix, fp);
+ strbuf_addstr(&sb, diff_line_prefix(o));
+
if (p != buf) {
- if (st_el->color && fputs(st_el->color, fp) < 0)
- return -1;
- if (fputs(st_el->prefix, fp) < 0 ||
- fwrite(buf, p ? p - buf : count, 1, fp) != 1 ||
- fputs(st_el->suffix, fp) < 0)
- return -1;
- if (st_el->color && *st_el->color
- && fputs(GIT_COLOR_RESET, fp) < 0)
- return -1;
+ const char *reset = st_el->color && *st_el->color ?
+ GIT_COLOR_RESET : NULL;
+ if (st_el->color && *st_el->color)
+ strbuf_addstr(&sb, st_el->color);
+ strbuf_addstr(&sb, st_el->prefix);
+ strbuf_add(&sb, buf, p ? p - buf : count);
+ strbuf_addstr(&sb, st_el->suffix);
+ if (reset)
+ strbuf_addstr(&sb, reset);
}
if (!p)
- return 0;
- if (fputs(newline, fp) < 0)
- return -1;
+ goto out;
+
+ strbuf_addstr(&sb, newline);
count -= p + 1 - buf;
buf = p + 1;
print = 1;
+ if (count) {
+ emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
+ sb.buf, sb.len, 0);
+ strbuf_reset(&sb);
+ }
}
+
+out:
+ if (sb.len)
+ emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
+ sb.buf, sb.len, 0);
+ strbuf_release(&sb);
return 0;
}
@@ -1212,24 +1228,20 @@ static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
fputs(line_prefix, diff_words->opt->file);
}
if (diff_words->current_plus != plus_begin) {
- fn_out_diff_words_write_helper(diff_words->opt->file,
+ fn_out_diff_words_write_helper(diff_words->opt,
&style->ctx, style->newline,
plus_begin - diff_words->current_plus,
- diff_words->current_plus, line_prefix);
- if (*(plus_begin - 1) == '\n')
- fputs(line_prefix, diff_words->opt->file);
+ diff_words->current_plus);
}
if (minus_begin != minus_end) {
- fn_out_diff_words_write_helper(diff_words->opt->file,
+ fn_out_diff_words_write_helper(diff_words->opt,
&style->old, style->newline,
- minus_end - minus_begin, minus_begin,
- line_prefix);
+ minus_end - minus_begin, minus_begin);
}
if (plus_begin != plus_end) {
- fn_out_diff_words_write_helper(diff_words->opt->file,
+ fn_out_diff_words_write_helper(diff_words->opt,
&style->new, style->newline,
- plus_end - plus_begin, plus_begin,
- line_prefix);
+ plus_end - plus_begin, plus_begin);
}
diff_words->current_plus = plus_end;
@@ -1323,11 +1335,12 @@ static void diff_words_show(struct diff_words_data *diff_words)
/* special case: only removal */
if (!diff_words->plus.text.size) {
- fputs(line_prefix, diff_words->opt->file);
- fn_out_diff_words_write_helper(diff_words->opt->file,
+ emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
+ line_prefix, strlen(line_prefix), 0);
+ fn_out_diff_words_write_helper(diff_words->opt,
&style->old, style->newline,
diff_words->minus.text.size,
- diff_words->minus.text.ptr, line_prefix);
+ diff_words->minus.text.ptr);
diff_words->minus.text.size = 0;
return;
}
@@ -1350,12 +1363,12 @@ static void diff_words_show(struct diff_words_data *diff_words)
if (diff_words->current_plus != diff_words->plus.text.ptr +
diff_words->plus.text.size) {
if (color_words_output_graph_prefix(diff_words))
- fputs(line_prefix, diff_words->opt->file);
- fn_out_diff_words_write_helper(diff_words->opt->file,
+ emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
+ line_prefix, strlen(line_prefix), 0);
+ fn_out_diff_words_write_helper(diff_words->opt,
&style->ctx, style->newline,
diff_words->plus.text.ptr + diff_words->plus.text.size
- - diff_words->current_plus, diff_words->current_plus,
- line_prefix);
+ - diff_words->current_plus, diff_words->current_plus);
}
diff_words->minus.text.size = diff_words->plus.text.size = 0;
}
--
2.12.2.575.gb14f27f917
next prev parent reply other threads:[~2017-06-20 2:49 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170523024048.16879-1-sbeller@google.com/>
2017-05-24 21:40 ` [PATCHv5 00/17] Diff machine: highlight moved lines Stefan Beller
2017-05-24 21:40 ` [PATCHv5 01/17] diff: readability fix Stefan Beller
2017-05-24 21:40 ` [PATCHv5 02/17] diff: move line ending check into emit_hunk_header Stefan Beller
2017-05-24 21:40 ` [PATCHv5 03/17] diff.c: factor out diff_flush_patch_all_file_pairs Stefan Beller
2017-05-24 21:40 ` [PATCHv5 04/17] diff: introduce more flexible emit function Stefan Beller
2017-06-13 21:54 ` Jonathan Tan
2017-06-13 23:41 ` Stefan Beller
2017-06-13 23:46 ` Jonathan Tan
2017-05-24 21:40 ` [PATCHv5 05/17] diff.c: convert fn_out_consume to use emit_line Stefan Beller
2017-05-24 21:40 ` [PATCHv5 06/17] diff.c: convert builtin_diff to use emit_line_* Stefan Beller
2017-05-24 21:40 ` [PATCHv5 07/17] diff.c: convert emit_rewrite_diff " Stefan Beller
2017-05-24 21:40 ` [PATCHv5 08/17] diff.c: convert emit_rewrite_lines " Stefan Beller
2017-05-24 21:40 ` [PATCHv5 09/17] submodule.c: convert show_submodule_summary to use emit_line_fmt Stefan Beller
2017-05-24 21:40 ` [PATCHv5 10/17] diff.c: convert emit_binary_diff_body to use emit_line_* Stefan Beller
2017-05-24 21:40 ` [PATCHv5 11/17] diff.c: convert show_stats " Stefan Beller
2017-05-24 21:40 ` [PATCHv5 12/17] diff.c: convert word diffing " Stefan Beller
2017-05-24 21:40 ` [PATCHv5 13/17] diff.c: convert diff_flush " Stefan Beller
2017-05-24 21:40 ` [PATCHv5 14/17] diff.c: convert diff_summary " Stefan Beller
2017-05-24 21:40 ` [PATCHv5 15/17] diff.c: emit_line includes whitespace highlighting Stefan Beller
2017-05-24 21:40 ` [PATCHv5 16/17] diff: buffer all output if asked to Stefan Beller
2017-05-25 2:26 ` Junio C Hamano
2017-05-25 5:34 ` Stefan Beller
2017-05-26 1:09 ` Junio C Hamano
2017-06-13 22:07 ` Jonathan Tan
2017-06-14 2:52 ` Stefan Beller
2017-05-24 21:40 ` [PATCHv5 17/17] diff.c: color moved lines differently Stefan Beller
2017-05-25 2:27 ` Junio C Hamano
2017-05-25 5:39 ` Stefan Beller
2017-05-25 6:44 ` [PATCHv5 00/17] Diff machine: highlight moved lines Junio C Hamano
2017-05-25 16:31 ` Stefan Beller
2017-05-26 1:20 ` Junio C Hamano
2017-05-26 19:30 ` Stefan Beller
2017-05-27 0:18 ` [PATCH 0/1] " Stefan Beller
2017-05-27 0:18 ` [PATCH 1/1] diff.c: color moved lines differently Stefan Beller
2017-05-27 7:05 ` Philip Oakley
2017-05-30 21:33 ` Stefan Beller
2017-06-01 0:24 ` [PATCH] " Stefan Beller
2017-06-13 22:51 ` Jonathan Tan
2017-06-14 18:55 ` Stefan Beller
2017-06-20 2:47 ` [PATCH 00/26] reroll of sb/diff-color-moved Stefan Beller
2017-06-20 2:47 ` [PATCH 01/26] diff.c: readability fix Stefan Beller
2017-06-20 2:47 ` [PATCH 02/26] diff.c: move line ending check into emit_hunk_header Stefan Beller
2017-06-20 2:47 ` [PATCH 03/26] diff.c: factor out diff_flush_patch_all_file_pairs Stefan Beller
2017-06-20 2:47 ` [PATCH 04/26] diff.c: introduce emit_diff_symbol Stefan Beller
2017-06-21 19:36 ` Junio C Hamano
2017-06-21 19:46 ` Stefan Beller
2017-06-21 20:26 ` Junio C Hamano
2017-06-21 21:13 ` Junio C Hamano
2017-06-21 21:23 ` Stefan Beller
2017-06-21 21:43 ` Junio C Hamano
2017-06-21 21:51 ` Stefan Beller
2017-06-21 21:45 ` Brandon Williams
2017-06-21 21:52 ` Junio C Hamano
2017-06-21 21:55 ` Brandon Williams
2017-06-20 2:47 ` [PATCH 05/26] diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_MARKER Stefan Beller
2017-06-20 2:47 ` [PATCH 06/26] diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFO Stefan Beller
2017-06-20 2:47 ` [PATCH 07/26] diff.c: emit_diff_symbol learns DIFF_SYMBOL_NO_LF_EOF Stefan Beller
2017-06-20 2:47 ` [PATCH 08/26] diff.c: migrate emit_line_checked to use emit_diff_symbol Stefan Beller
2017-06-21 20:05 ` Junio C Hamano
2017-06-22 23:30 ` Stefan Beller
2017-06-22 23:37 ` Stefan Beller
2017-06-23 4:56 ` Junio C Hamano
2017-06-20 2:47 ` [PATCH 09/26] diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS{_PORCELAIN} Stefan Beller
2017-06-20 2:48 ` [PATCH 10/26] diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_INCOMPLETE Stefan Beller
2017-06-20 2:48 ` [PATCH 11/26] diff.c: emit_diff_symbol learns DIFF_SYMBOL_FILEPAIR Stefan Beller
2017-06-20 20:01 ` Jonathan Tan
2017-06-21 20:09 ` Junio C Hamano
2017-06-22 23:59 ` Stefan Beller
2017-06-20 2:48 ` [PATCH 12/26] diff.c: emit_diff_symbol learns DIFF_SYMBOL_HEADER Stefan Beller
2017-06-20 2:48 ` [PATCH 13/26] diff.c: emit_diff_symbol learns about DIFF_SYMBOL_BINARY_FILES Stefan Beller
2017-06-21 20:13 ` Junio C Hamano
2017-06-21 20:47 ` Stefan Beller
2017-06-20 2:48 ` [PATCH 14/26] diff.c: emit_diff_symbol learns DIFF_SYMBOL_REWRITE_DIFF Stefan Beller
2017-06-20 2:48 ` [PATCH 15/26] submodule.c: migrate diff output to use emit_diff_symbol Stefan Beller
2017-06-20 20:09 ` Jonathan Tan
2017-06-20 2:48 ` [PATCH 16/26] diff.c: convert emit_binary_diff_body " Stefan Beller
2017-06-21 20:16 ` Junio C Hamano
2017-06-20 2:48 ` [PATCH 17/26] diff.c: convert show_stats " Stefan Beller
2017-06-21 21:39 ` Brandon Williams
2017-06-21 22:16 ` Stefan Beller
2017-06-20 2:48 ` Stefan Beller [this message]
2017-06-20 2:48 ` [PATCH 19/26] diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEP Stefan Beller
2017-06-20 2:48 ` [PATCH 20/26] diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY Stefan Beller
2017-06-20 2:48 ` [PATCH 21/26] diff.c: buffer all output if asked to Stefan Beller
2017-06-20 2:48 ` [PATCH 22/26] diff.c: color moved lines differently Stefan Beller
2017-06-20 20:13 ` Jonathan Tan
2017-06-20 20:57 ` Stefan Beller
2017-06-20 2:48 ` [PATCH 23/26] diff.c: color moved lines differently, plain mode Stefan Beller
2017-06-20 2:48 ` [PATCH 24/26] diff.c: add dimming to moved line detection Stefan Beller
2017-06-21 20:23 ` Junio C Hamano
2017-06-20 2:48 ` [PATCH 25/26] diff: document the new --color-moved setting Stefan Beller
2017-06-20 2:48 ` [showing-off RFC/PATCH 26/26] diff.c: have a "machine parseable" move coloring Stefan Beller
2017-06-20 2:50 ` Stefan Beller
2017-06-23 21:43 ` Ævar Arnfjörð Bjarmason
2017-06-21 21:51 ` Brandon Williams
2017-06-21 21:55 ` Junio C Hamano
2017-06-21 22:40 ` Stefan Beller
2017-06-23 1:28 ` [PATCHv2 00/25] reroll of sb/diff-color-moved Stefan Beller
2017-06-23 1:28 ` [PATCHv2 01/25] diff.c: readability fix Stefan Beller
2017-06-23 1:28 ` [PATCHv2 02/25] diff.c: move line ending check into emit_hunk_header Stefan Beller
2017-06-23 1:28 ` [PATCHv2 03/25] diff.c: factor out diff_flush_patch_all_file_pairs Stefan Beller
2017-06-23 1:28 ` [PATCHv2 04/25] diff.c: introduce emit_diff_symbol Stefan Beller
2017-06-23 20:07 ` Junio C Hamano
2017-06-23 20:13 ` Stefan Beller
2017-06-23 1:28 ` [PATCHv2 05/25] diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_MARKER Stefan Beller
2017-06-23 1:29 ` [PATCHv2 06/25] diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFO Stefan Beller
2017-06-23 1:29 ` [PATCHv2 07/25] diff.c: emit_diff_symbol learns DIFF_SYMBOL_NO_LF_EOF Stefan Beller
2017-06-23 1:29 ` [PATCHv2 08/25] diff.c: migrate emit_line_checked to use emit_diff_symbol Stefan Beller
2017-06-23 1:29 ` [PATCHv2 09/25] diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS[_PORCELAIN] Stefan Beller
2017-06-23 1:29 ` [PATCHv2 10/25] diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_INCOMPLETE Stefan Beller
2017-06-23 1:29 ` [PATCHv2 11/25] diff.c: emit_diff_symbol learns DIFF_SYMBOL_FILEPAIR_{PLUS, MINUS} Stefan Beller
2017-06-23 1:29 ` [PATCHv2 12/25] diff.c: emit_diff_symbol learns DIFF_SYMBOL_HEADER Stefan Beller
2017-06-23 1:29 ` [PATCHv2 13/25] diff.c: emit_diff_symbol learns about DIFF_SYMBOL_BINARY_FILES Stefan Beller
2017-06-23 1:29 ` [PATCHv2 14/25] diff.c: emit_diff_symbol learns DIFF_SYMBOL_REWRITE_DIFF Stefan Beller
2017-06-23 1:29 ` [PATCHv2 15/25] submodule.c: migrate diff output to use emit_diff_symbol Stefan Beller
2017-06-23 1:29 ` [PATCHv2 16/25] diff.c: convert emit_binary_diff_body " Stefan Beller
2017-06-23 1:29 ` [PATCHv2 17/25] diff.c: convert show_stats " Stefan Beller
2017-06-23 1:29 ` [PATCHv2 18/25] diff.c: convert word diffing " Stefan Beller
2017-06-23 1:29 ` [PATCHv2 19/25] diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEP Stefan Beller
2017-06-23 1:29 ` [PATCHv2 20/25] diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY Stefan Beller
2017-06-23 1:29 ` [PATCHv2 21/25] diff.c: buffer all output if asked to Stefan Beller
2017-06-23 1:29 ` [PATCHv2 22/25] diff.c: color moved lines differently Stefan Beller
2017-06-23 1:29 ` [PATCHv2 23/25] diff.c: color moved lines differently, plain mode Stefan Beller
2017-06-23 1:29 ` [PATCHv2 24/25] diff.c: add dimming to moved line detection Stefan Beller
2017-06-23 1:29 ` [PATCHv2 25/25] diff: document the new --color-moved setting Stefan Beller
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=20170620024816.20021-19-sbeller@google.com \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=philipoakley@iee.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.
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).