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 20/26] diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY
Date: Mon, 19 Jun 2017 19:48:10 -0700 [thread overview]
Message-ID: <20170620024816.20021-21-sbeller@google.com> (raw)
In-Reply-To: <20170620024816.20021-1-sbeller@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
diff.c | 73 +++++++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 43 insertions(+), 30 deletions(-)
diff --git a/diff.c b/diff.c
index 18bfc4720b..f2f7a4da79 100644
--- a/diff.c
+++ b/diff.c
@@ -592,6 +592,7 @@ enum diff_symbol {
DIFF_SYMBOL_STATS_LINE,
DIFF_SYMBOL_WORD_DIFF,
DIFF_SYMBOL_STAT_SEP,
+ DIFF_SYMBOL_SUMMARY,
};
/*
* Flags for content lines:
@@ -780,6 +781,9 @@ static void emit_diff_symbol(struct diff_options *o, enum diff_symbol s,
case DIFF_SYMBOL_STAT_SEP:
fputs(o->stat_sep, o->file);
break;
+ case DIFF_SYMBOL_SUMMARY:
+ emit_line(o, "", "", line, len);
+ break;
default:
die("BUG: unknown diff symbol");
}
@@ -4727,67 +4731,76 @@ static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
}
}
-static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
+static void show_file_mode_name(struct diff_options *opt, const char *newdelete, struct diff_filespec *fs)
{
+ struct strbuf sb = STRBUF_INIT;
if (fs->mode)
- fprintf(file, " %s mode %06o ", newdelete, fs->mode);
+ strbuf_addf(&sb, " %s mode %06o ", newdelete, fs->mode);
else
- fprintf(file, " %s ", newdelete);
- write_name_quoted(fs->path, file, '\n');
-}
+ strbuf_addf(&sb, " %s ", newdelete);
+ quote_c_style(fs->path, &sb, NULL, 0);
+ strbuf_addch(&sb, '\n');
+ emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
+ sb.buf, sb.len, 0);
+ strbuf_release(&sb);
+}
-static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name,
- const char *line_prefix)
+static void show_mode_change(struct diff_options *opt, struct diff_filepair *p,
+ int show_name)
{
if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
- fprintf(file, "%s mode change %06o => %06o%c", line_prefix, p->one->mode,
- p->two->mode, show_name ? ' ' : '\n');
+ struct strbuf sb = STRBUF_INIT;
+ strbuf_addf(&sb, " mode change %06o => %06o",
+ p->one->mode, p->two->mode);
if (show_name) {
- write_name_quoted(p->two->path, file, '\n');
+ strbuf_addch(&sb, ' ');
+ quote_c_style(p->two->path, &sb, NULL, 0);
}
+ emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
+ sb.buf, sb.len, 0);
+ strbuf_release(&sb);
}
}
-static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p,
- const char *line_prefix)
+static void show_rename_copy(struct diff_options *opt, const char *renamecopy,
+ struct diff_filepair *p)
{
+ struct strbuf sb = STRBUF_INIT;
char *names = pprint_rename(p->one->path, p->two->path);
-
- fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
+ strbuf_addf(&sb, " %s %s (%d%%)\n",
+ renamecopy, names, similarity_index(p));
free(names);
- show_mode_change(file, p, 0, line_prefix);
+ emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
+ sb.buf, sb.len, 0);
+ show_mode_change(opt, p, 0);
}
static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
{
- FILE *file = opt->file;
- const char *line_prefix = diff_line_prefix(opt);
-
switch(p->status) {
case DIFF_STATUS_DELETED:
- fputs(line_prefix, file);
- show_file_mode_name(file, "delete", p->one);
+ show_file_mode_name(opt, "delete", p->one);
break;
case DIFF_STATUS_ADDED:
- fputs(line_prefix, file);
- show_file_mode_name(file, "create", p->two);
+ show_file_mode_name(opt, "create", p->two);
break;
case DIFF_STATUS_COPIED:
- fputs(line_prefix, file);
- show_rename_copy(file, "copy", p, line_prefix);
+ show_rename_copy(opt, "copy", p);
break;
case DIFF_STATUS_RENAMED:
- fputs(line_prefix, file);
- show_rename_copy(file, "rename", p, line_prefix);
+ show_rename_copy(opt, "rename", p);
break;
default:
if (p->score) {
- fprintf(file, "%s rewrite ", line_prefix);
- write_name_quoted(p->two->path, file, ' ');
- fprintf(file, "(%d%%)\n", similarity_index(p));
+ struct strbuf sb = STRBUF_INIT;
+ strbuf_addstr(&sb, " rewrite ");
+ quote_c_style(p->two->path, &sb, NULL, 0);
+ strbuf_addf(&sb, " (%d%%)\n", similarity_index(p));
+ emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
+ sb.buf, sb.len, 0);
}
- show_mode_change(file, p, !p->score, line_prefix);
+ show_mode_change(opt, p, !p->score);
break;
}
}
--
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 ` [PATCH 18/26] diff.c: convert word diffing " Stefan Beller
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 ` Stefan Beller [this message]
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-21-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).