From: Stefan Beller <sbeller@google•com>
To: gitster@pobox•com
Cc: git@vger•kernel.org, bmwill@google•com, jrnieder@gmail•com,
jonathantanmy@google•com, peff@peff•net, mhagger@alum•mit.edu,
Stefan Beller <sbeller@google•com>
Subject: [PATCHv4 04/17] diff: introduce more flexible emit function
Date: Mon, 22 May 2017 19:40:35 -0700 [thread overview]
Message-ID: <20170523024048.16879-5-sbeller@google.com> (raw)
In-Reply-To: <20170523024048.16879-1-sbeller@google.com>
Currently, diff output is written either through the emit_line_0
function or through the FILE * in struct diff_options directly. To
make it easier to teach diff to buffer its output (which will be done
in a subsequent commit), introduce a more flexible emit_line() function.
In this commit, direct usages of emit_line_0() are replaced with
emit_line(); subsequent commits will also replace usages of the
FILE * with emit().
Instead of having a 'first' parameter containing the first character
of a line, have a dedicated 'sign' parameter that is just set when
the first character of the line is part of the actual content, i.e.
' ', '+', '-'.
Signed-off-by: Stefan Beller <sbeller@google•com>
---
diff.c | 76 +++++++++++++++++++++++++++++-------------------------------------
1 file changed, 33 insertions(+), 43 deletions(-)
diff --git a/diff.c b/diff.c
index 2f9722b382..3569857818 100644
--- a/diff.c
+++ b/diff.c
@@ -516,36 +516,30 @@ static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
ecbdata->blank_at_eof_in_postimage = (at - l2) + 1;
}
-static void emit_line_0(struct diff_options *o, const char *set, const char *reset,
- int first, const char *line, int len)
+static void emit_line(struct diff_options *o, const char *set, const char *reset,
+ int add_line_prefix, int sign, const char *line, int len)
{
int has_trailing_newline, has_trailing_carriage_return;
- int nofirst;
FILE *file = o->file;
- fputs(diff_line_prefix(o), file);
+ if (add_line_prefix)
+ fputs(diff_line_prefix(o), file);
- if (len == 0) {
- has_trailing_newline = (first == '\n');
- has_trailing_carriage_return = (!has_trailing_newline &&
- (first == '\r'));
- nofirst = has_trailing_newline || has_trailing_carriage_return;
- } else {
- has_trailing_newline = (len > 0 && line[len-1] == '\n');
- if (has_trailing_newline)
- len--;
- has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
- if (has_trailing_carriage_return)
- len--;
- nofirst = 0;
- }
+ has_trailing_newline = (len > 0 && line[len-1] == '\n');
+ if (has_trailing_newline)
+ len--;
+ has_trailing_carriage_return = (len > 0 && line[len-1] == '\r');
+ if (has_trailing_carriage_return)
+ len--;
- if (len || !nofirst) {
- fputs(set, file);
- if (!nofirst)
- fputc(first, file);
+ if (len || sign) {
+ if (set)
+ fputs(set, file);
+ if (sign)
+ fputc(sign, file);
fwrite(line, len, 1, file);
- fputs(reset, file);
+ if (reset)
+ fputs(reset, file);
}
if (has_trailing_carriage_return)
fputc('\r', file);
@@ -553,12 +547,6 @@ static void emit_line_0(struct diff_options *o, const char *set, const char *res
fputc('\n', file);
}
-static void emit_line(struct diff_options *o, const char *set, const char *reset,
- const char *line, int len)
-{
- emit_line_0(o, set, reset, line[0], line+1, len-1);
-}
-
static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
{
if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
@@ -587,13 +575,13 @@ static void emit_line_checked(const char *reset,
}
if (!ws)
- emit_line_0(ecbdata->opt, set, reset, sign, line, len);
+ emit_line(ecbdata->opt, set, reset, 1, sign, line, len);
else if (sign == '+' && new_blank_line_at_eof(ecbdata, line, len))
/* Blank line at EOF - paint '+' as well */
- emit_line_0(ecbdata->opt, ws, reset, sign, line, len);
+ emit_line(ecbdata->opt, ws, reset, 1, sign, line, len);
else {
/* Emit just the prefix, then the rest. */
- emit_line_0(ecbdata->opt, set, reset, sign, "", 0);
+ emit_line(ecbdata->opt, set, reset, 1, sign, "", 0);
ws_check_emit(line, len, ecbdata->ws_rule,
ecbdata->opt->file, set, reset, ws);
}
@@ -643,7 +631,7 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
if (len < 10 ||
memcmp(line, atat, 2) ||
!(ep = memmem(line + 2, len - 2, atat, 2))) {
- emit_line(ecbdata->opt, context, reset, line, len);
+ emit_line(ecbdata->opt, context, reset, 1, 0, line, len);
return;
}
ep += 2; /* skip over @@ */
@@ -679,7 +667,7 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
strbuf_add(&msgbuf, line + len, org_len - len);
strbuf_complete_line(&msgbuf);
- emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
+ emit_line(ecbdata->opt, "", "", 1, 0, msgbuf.buf, msgbuf.len);
strbuf_release(&msgbuf);
}
@@ -742,8 +730,8 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
const char *context = diff_get_color(ecb->color_diff,
DIFF_CONTEXT);
putc('\n', ecb->opt->file);
- emit_line_0(ecb->opt, context, reset, '\\',
- nneof, strlen(nneof));
+ emit_line(ecb->opt, context, reset, 1, '\\',
+ nneof, strlen(nneof));
}
}
@@ -1341,7 +1329,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
}
diff_words_flush(ecbdata);
if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
- emit_line(o, context, reset, line, len);
+ emit_line(o, context, reset, 1, 0, line, len);
fputs("~\n", o->file);
} else {
/*
@@ -1353,7 +1341,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
line++;
len--;
}
- emit_line(o, context, reset, line, len);
+ emit_line(o, context, reset, 1, 0, line, len);
}
return;
}
@@ -1376,7 +1364,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
/* incomplete line at the end */
ecbdata->lno_in_preimage++;
emit_line(o, diff_get_color(ecbdata->color_diff, DIFF_CONTEXT),
- reset, line, len);
+ reset, 1, 0, line, len);
break;
}
}
@@ -2188,7 +2176,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
fprintf(data->o->file, "%s%s:%d: %s.\n",
line_prefix, data->filename, data->lineno, err);
free(err);
- emit_line(data->o, set, reset, line, 1);
+ emit_line(data->o, set, reset, 1, 0, line, 1);
ws_check_emit(line + 1, len - 1, data->ws_rule,
data->o->file, set, reset, ws);
} else if (line[0] == ' ') {
@@ -4833,9 +4821,11 @@ void diff_flush(struct diff_options *options)
if (output_format & DIFF_FORMAT_PATCH) {
if (separator) {
- fprintf(options->file, "%s%c",
- diff_line_prefix(options),
- options->line_termination);
+ char term[2];
+ term[0] = options->line_termination;
+ term[1] = '\0';
+
+ emit_line(options, NULL, NULL, 1, 0, term, !!term[0]);
if (options->stat_sep) {
/* attach patch instead of inline */
fputs(options->stat_sep, options->file);
--
2.13.0.18.g7d86cc8ba0
next prev parent reply other threads:[~2017-05-23 2:41 UTC|newest]
Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-14 4:00 [RFC PATCH 00/19] Diff machine: highlight moved lines Stefan Beller
2017-05-14 4:00 ` [PATCH 01/19] diff: readability fix Stefan Beller
2017-05-14 4:01 ` [PATCH 02/19] diff: move line ending check into emit_hunk_header Stefan Beller
2017-05-15 6:48 ` Junio C Hamano
2017-05-15 16:13 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 03/19] diff.c: drop 'nofirst' from emit_line_0 Stefan Beller
2017-05-15 18:26 ` Jonathan Tan
2017-05-15 18:33 ` Stefan Beller
2017-05-16 16:05 ` Jonathan Tan
2017-05-15 19:22 ` Brandon Williams
2017-05-15 19:35 ` Stefan Beller
2017-05-15 19:45 ` Brandon Williams
2017-05-14 4:01 ` [PATCH 04/19] diff.c: factor out diff_flush_patch_all_file_pairs Stefan Beller
2017-05-14 4:01 ` [PATCH 05/19] diff.c: emit_line_0 can handle no color setting Stefan Beller
2017-05-15 18:31 ` Jonathan Tan
2017-05-15 22:11 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 06/19] diff: add emit_line_fmt Stefan Beller
2017-05-15 19:31 ` Brandon Williams
2017-05-14 4:01 ` [PATCH 07/19] diff.c: convert fn_out_consume to use emit_line_* Stefan Beller
2017-05-16 1:00 ` Junio C Hamano
2017-05-16 1:05 ` Junio C Hamano
2017-05-16 16:23 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 08/19] diff.c: convert builtin_diff " Stefan Beller
2017-05-15 18:42 ` Jonathan Tan
2017-05-14 4:01 ` [PATCH 09/19] diff.c: convert emit_rewrite_diff " Stefan Beller
2017-05-14 4:01 ` [PATCH 10/19] diff.c: convert emit_rewrite_lines " Stefan Beller
2017-05-15 19:09 ` Jonathan Tan
2017-05-15 19:31 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 11/19] submodule.c: convert show_submodule_summary to use emit_line_fmt Stefan Beller
2017-05-14 4:01 ` [PATCH 12/19] diff.c: convert emit_binary_diff_body to use emit_line_* Stefan Beller
2017-05-14 4:01 ` [PATCH 13/19] diff.c: convert show_stats " Stefan Beller
2017-05-14 4:01 ` [PATCH 14/19] diff.c: convert word diffing " Stefan Beller
2017-05-15 22:40 ` Jonathan Tan
2017-05-15 23:12 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 15/19] diff.c: convert diff_flush " Stefan Beller
2017-05-15 20:21 ` Jonathan Tan
2017-05-15 22:08 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 16/19] diff.c: convert diff_summary " Stefan Beller
2017-05-14 4:01 ` [PATCH 17/19] diff.c: factor out emit_line_ws for coloring whitespaces Stefan Beller
2017-05-14 4:01 ` [PATCH 18/19] diff: buffer all output if asked to Stefan Beller
2017-05-14 4:06 ` Jeff King
2017-05-14 4:25 ` Stefan Beller
2017-05-16 4:14 ` Jonathan Tan
2017-05-16 16:42 ` Stefan Beller
2017-05-14 4:01 ` [PATCH 19/19] diff.c: color moved lines differently Stefan Beller
2017-05-15 22:42 ` Brandon Williams
2017-05-16 4:34 ` Jonathan Tan
2017-05-16 12:31 ` Jeff King
2017-05-15 12:43 ` [RFC PATCH 00/19] Diff machine: highlight moved lines Junio C Hamano
2017-05-15 16:33 ` Stefan Beller
2017-05-17 2:58 ` [PATCHv2 00/20] " Stefan Beller
2017-05-17 2:58 ` [PATCHv2 01/20] diff: readability fix Stefan Beller
2017-05-17 2:58 ` [PATCHv2 02/20] diff: move line ending check into emit_hunk_header Stefan Beller
2017-05-17 2:58 ` [PATCHv2 03/20] diff.c: factor out diff_flush_patch_all_file_pairs Stefan Beller
2017-05-17 2:58 ` [PATCHv2 04/20] diff.c: teach emit_line_0 to accept sign parameter Stefan Beller
2017-05-17 2:58 ` [PATCHv2 05/20] diff.c: emit_line_0 can handle no color setting Stefan Beller
2017-05-17 2:58 ` [PATCHv2 06/20] diff.c: emit_line_0 takes parameter whether to output line prefix Stefan Beller
2017-05-17 2:58 ` [PATCHv2 07/20] diff.c: inline emit_line_0 into emit_line Stefan Beller
2017-05-17 2:58 ` [PATCHv2 08/20] diff.c: convert fn_out_consume to use emit_line Stefan Beller
2017-05-17 2:58 ` [PATCHv2 09/20] diff.c: convert builtin_diff to use emit_line_* Stefan Beller
2017-05-17 2:58 ` [PATCHv2 10/20] diff.c: convert emit_rewrite_diff " Stefan Beller
2017-05-17 2:58 ` [PATCHv2 11/20] diff.c: convert emit_rewrite_lines " Stefan Beller
2017-05-17 5:03 ` Junio C Hamano
2017-05-17 21:16 ` Stefan Beller
2017-05-18 3:35 ` Junio C Hamano
2017-05-17 2:58 ` [PATCHv2 12/20] submodule.c: convert show_submodule_summary to use emit_line_fmt Stefan Beller
2017-05-17 5:19 ` Junio C Hamano
2017-05-17 21:05 ` Stefan Beller
2017-05-18 3:25 ` Junio C Hamano
2017-05-18 17:12 ` Stefan Beller
2017-05-20 4:50 ` Junio C Hamano
2017-05-20 22:00 ` Stefan Beller
2017-05-17 2:58 ` [PATCHv2 13/20] diff.c: convert emit_binary_diff_body to use emit_line_* Stefan Beller
2017-05-17 2:58 ` [PATCHv2 14/20] diff.c: convert show_stats " Stefan Beller
2017-05-17 2:58 ` [PATCHv2 15/20] diff.c: convert word diffing " Stefan Beller
2017-05-17 2:58 ` [PATCHv2 16/20] diff.c: convert diff_flush " Stefan Beller
2017-05-17 2:58 ` [PATCHv2 17/20] diff.c: convert diff_summary " Stefan Beller
2017-05-17 2:58 ` [PATCHv2 18/20] diff.c: emit_line includes whitespace highlighting Stefan Beller
2017-05-17 2:58 ` [PATCHv2 19/20] diff: buffer all output if asked to Stefan Beller
2017-05-17 2:58 ` [PATCHv2 20/20] diff.c: color moved lines differently Stefan Beller
2017-05-18 19:37 ` [PATCHv3 00/20] Diff machine: highlight moved lines Stefan Beller
2017-05-18 19:37 ` [PATCHv3 01/20] diff: readability fix Stefan Beller
2017-05-18 19:37 ` [PATCHv3 02/20] diff: move line ending check into emit_hunk_header Stefan Beller
2017-05-18 19:37 ` [PATCHv3 03/20] diff.c: factor out diff_flush_patch_all_file_pairs Stefan Beller
2017-05-18 19:37 ` [PATCHv3 04/20] diff.c: teach emit_line_0 to accept sign parameter Stefan Beller
2017-05-18 23:33 ` Jonathan Tan
2017-05-22 23:36 ` Stefan Beller
2017-05-18 19:37 ` [PATCHv3 05/20] diff.c: emit_line_0 can handle no color setting Stefan Beller
2017-05-18 19:37 ` [PATCHv3 06/20] diff.c: emit_line_0 takes parameter whether to output line prefix Stefan Beller
2017-05-18 19:37 ` [PATCHv3 07/20] diff.c: inline emit_line_0 into emit_line Stefan Beller
2017-05-18 19:37 ` [PATCHv3 08/20] diff.c: convert fn_out_consume to use emit_line Stefan Beller
2017-05-18 19:37 ` [PATCHv3 09/20] diff.c: convert builtin_diff to use emit_line_* Stefan Beller
2017-05-18 19:37 ` [PATCHv3 10/20] diff.c: convert emit_rewrite_diff " Stefan Beller
2017-05-18 19:37 ` [PATCHv3 11/20] diff.c: convert emit_rewrite_lines " Stefan Beller
2017-05-18 19:37 ` [PATCHv3 12/20] submodule.c: convert show_submodule_summary to use emit_line_fmt Stefan Beller
2017-05-18 19:37 ` [PATCHv3 13/20] diff.c: convert emit_binary_diff_body to use emit_line_* Stefan Beller
2017-05-18 19:37 ` [PATCHv3 14/20] diff.c: convert show_stats " Stefan Beller
2017-05-18 19:37 ` [PATCHv3 15/20] diff.c: convert word diffing " Stefan Beller
2017-05-18 19:37 ` [PATCHv3 16/20] diff.c: convert diff_flush " Stefan Beller
2017-05-18 19:37 ` [PATCHv3 17/20] diff.c: convert diff_summary " Stefan Beller
2017-05-18 19:37 ` [PATCHv3 18/20] diff.c: emit_line includes whitespace highlighting Stefan Beller
2017-05-18 19:37 ` [PATCHv3 19/20] diff: buffer all output if asked to Stefan Beller
2017-05-18 19:37 ` [PATCHv3 20/20] diff.c: color moved lines differently Stefan Beller
2017-05-19 18:23 ` Jonathan Tan
2017-05-19 18:40 ` Stefan Beller
2017-05-19 19:34 ` Jonathan Tan
2017-05-23 2:40 ` [PATCHv4 00/17] Diff machine: highlight moved lines Stefan Beller
2017-05-23 2:40 ` [PATCHv4 01/17] diff: readability fix Stefan Beller
2017-05-23 2:40 ` [PATCHv4 02/17] diff: move line ending check into emit_hunk_header Stefan Beller
2017-05-23 2:40 ` [PATCHv4 03/17] diff.c: factor out diff_flush_patch_all_file_pairs Stefan Beller
2017-05-23 2:40 ` Stefan Beller [this message]
2017-05-23 2:40 ` [PATCHv4 05/17] diff.c: convert fn_out_consume to use emit_line Stefan Beller
2017-05-23 2:40 ` [PATCHv4 06/17] diff.c: convert builtin_diff to use emit_line_* Stefan Beller
2017-05-23 2:40 ` [PATCHv4 07/17] diff.c: convert emit_rewrite_diff " Stefan Beller
2017-05-23 2:40 ` [PATCHv4 08/17] diff.c: convert emit_rewrite_lines " Stefan Beller
2017-05-23 2:40 ` [PATCHv4 09/17] submodule.c: convert show_submodule_summary to use emit_line_fmt Stefan Beller
2017-05-23 5:59 ` Junio C Hamano
2017-05-23 18:14 ` Stefan Beller
2017-05-23 2:40 ` [PATCHv4 10/17] diff.c: convert emit_binary_diff_body to use emit_line_* Stefan Beller
2017-05-23 2:40 ` [PATCHv4 11/17] diff.c: convert show_stats " Stefan Beller
2017-05-23 2:40 ` [PATCHv4 12/17] diff.c: convert word diffing " Stefan Beller
2017-05-23 2:40 ` [PATCHv4 13/17] diff.c: convert diff_flush " Stefan Beller
2017-05-23 2:40 ` [PATCHv4 14/17] diff.c: convert diff_summary " Stefan Beller
2017-05-23 2:40 ` [PATCHv4 15/17] diff.c: emit_line includes whitespace highlighting Stefan Beller
2017-05-23 2:40 ` [PATCHv4 16/17] diff: buffer all output if asked to Stefan Beller
2017-05-23 2:40 ` [PATCHv4 17/17] diff.c: color moved lines differently Stefan Beller
2017-05-27 1:04 ` [PATCHv4 00/17] Diff machine: highlight moved lines Jacob Keller
2017-05-30 21:38 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170523024048.16879-5-sbeller@google.com \
--to=sbeller@google$(echo .)com \
--cc=bmwill@google$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jonathantanmy@google$(echo .)com \
--cc=jrnieder@gmail$(echo .)com \
--cc=mhagger@alum$(echo .)mit.edu \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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