mirror of
https://github.com/git/git
synced 2024-10-01 06:05:20 +00:00
diff: use emit_line_0 once per line
All lines that use emit_line_0 multiple times per line, are combined into a single call to emit_line_0, making use of the 'set' argument. We gain a little efficiency here, as we can omit emission of color and accompanying reset if 'len == 0'. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
017ac45e87
commit
29ef759d7c
16
diff.c
16
diff.c
|
@ -656,12 +656,14 @@ static void emit_line_0(struct diff_options *o,
|
|||
fputs(set_sign, file);
|
||||
if (first && !nofirst)
|
||||
fputc(first, file);
|
||||
if (set && set != set_sign) {
|
||||
if (set_sign)
|
||||
fputs(reset, file);
|
||||
fputs(set, file);
|
||||
if (len) {
|
||||
if (set && set != set_sign) {
|
||||
if (set_sign)
|
||||
fputs(reset, file);
|
||||
fputs(set, file);
|
||||
}
|
||||
fwrite(line, len, 1, file);
|
||||
}
|
||||
fwrite(line, len, 1, file);
|
||||
fputs(reset, file);
|
||||
}
|
||||
if (has_trailing_carriage_return)
|
||||
|
@ -1207,9 +1209,7 @@ static void emit_line_ws_markup(struct diff_options *o,
|
|||
if (!ws && !set_sign)
|
||||
emit_line_0(o, set, NULL, 0, reset, sign, line, len);
|
||||
else if (!ws) {
|
||||
/* Emit just the prefix, then the rest. */
|
||||
emit_line_0(o, set_sign, NULL, !!set_sign, reset, sign, "", 0);
|
||||
emit_line_0(o, set, NULL, 0, reset, 0, line, len);
|
||||
emit_line_0(o, set_sign, set, !!set_sign, reset, sign, line, len);
|
||||
} else if (blank_at_eof)
|
||||
/* Blank line at EOF - paint '+' as well */
|
||||
emit_line_0(o, ws, NULL, 0, reset, sign, line, len);
|
||||
|
|
|
@ -151,7 +151,7 @@ test_expect_success 'dual-coloring' '
|
|||
: s/4/A/<RESET>
|
||||
: <RESET>
|
||||
: <REVERSE><GREEN>+<RESET><BOLD> Also a silly comment here!<RESET>
|
||||
: <REVERSE><GREEN>+<RESET><BOLD><RESET>
|
||||
: <REVERSE><GREEN>+<RESET>
|
||||
: diff --git a/file b/file<RESET>
|
||||
: <RED> --- a/file<RESET>
|
||||
: <GREEN> +++ b/file<RESET>
|
||||
|
|
Loading…
Reference in a new issue