mirror of
https://github.com/git/git.git
synced 2024-11-01 06:47:52 +01:00
dc801e71a7
Number of columns required for change counts is now computed based on the maximum number of changed lines instead of being fixed. This means that usually a few more columns will be available for the filenames and the graph. The graph width logic is also modified to include enough space for "Bin XXX -> YYY bytes". If changes to binary files are mixed with changes to text files, change counts are padded to take at least three columns. And the other way around, if change counts require more than three columns, then "Bin"s are padded to align with the change count. This way, the +- part starts in the same column as "XXX -> YYY" part for binary files. This makes the graph easier to parse visually thanks to the empty column. This mimics the layout of diff --stat before this change. Tests and the tutorial are updated to reflect the new --stat output. This means either the removal of extra padding and/or the addition of up to three extra characters to truncated filenames. One test is added to check the graph alignment when a binary file change and text file change of more than 999 lines are committed together. Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
64 lines
1.5 KiB
Text
64 lines
1.5 KiB
Text
---
|
|
builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-
|
|
1 files changed, 36 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
|
|
index b0b5d8f..461c47e 100644
|
|
--- a/builtin-mailinfo.c
|
|
+++ b/builtin-mailinfo.c
|
|
@@ -712,6 +712,34 @@ static inline int patchbreak(const struct strbuf *line)
|
|
return 0;
|
|
}
|
|
|
|
+static int scissors(const struct strbuf *line)
|
|
+{
|
|
+ size_t i, len = line->len;
|
|
+ int scissors_dashes_seen = 0;
|
|
+ const char *buf = line->buf;
|
|
+
|
|
+ for (i = 0; i < len; i++) {
|
|
+ if (isspace(buf[i]))
|
|
+ continue;
|
|
+ if (buf[i] == '-') {
|
|
+ scissors_dashes_seen |= 02;
|
|
+ continue;
|
|
+ }
|
|
+ if (i + 1 < len && !memcmp(buf + i, ">8", 2)) {
|
|
+ scissors_dashes_seen |= 01;
|
|
+ i++;
|
|
+ continue;
|
|
+ }
|
|
+ if (i + 7 < len && !memcmp(buf + i, "cut here", 8)) {
|
|
+ i += 7;
|
|
+ continue;
|
|
+ }
|
|
+ /* everything else --- not scissors */
|
|
+ break;
|
|
+ }
|
|
+ return scissors_dashes_seen == 03;
|
|
+}
|
|
+
|
|
static int handle_commit_msg(struct strbuf *line)
|
|
{
|
|
static int still_looking = 1;
|
|
@@ -723,10 +751,17 @@ static int handle_commit_msg(struct strbuf *line)
|
|
strbuf_ltrim(line);
|
|
if (!line->len)
|
|
return 0;
|
|
- if ((still_looking = check_header(line, s_hdr_data, 0)) != 0)
|
|
+ still_looking = check_header(line, s_hdr_data, 0);
|
|
+ if (still_looking)
|
|
return 0;
|
|
}
|
|
|
|
+ if (scissors(line)) {
|
|
+ fseek(cmitmsg, 0L, SEEK_SET);
|
|
+ still_looking = 1;
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
/* normalize the log message to UTF-8. */
|
|
if (metainfo_charset)
|
|
convert_to_utf8(line, charset.buf);
|
|
--
|
|
1.6.4.1
|