@matheusbsbs / matheus-bagliano / commits / 2543a64187

range-diff: indent special lines as context

The range-diff coloring is a bit fuzzy when it comes to special lines of a diff, such as indicating new and old files with +++ and ---, as it would pickup the first character and interpret it for its coloring, which seems annoying as in regular diffs, these lines are colored bold via DIFF_METAINFO. By indenting these lines by a white space, they will be treated as context which is much more useful, an example [1] on the range diff series itself: [...] + diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt + new file mode 100644 + --- /dev/null + +++ b/Documentation/git-range-diff.txt +@@ ++git-range-diff(1) [...] + diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile [...] The first lines that introduce the new file for the man page will have the '+' sign colored and the rest of the line will be bold. The later lines that indicate a change to the Makefile will be treated as context both in the outer and inner diff, such that those lines stay regular color. [1] ./git-range-diff pr-1/dscho/branch-diff-v3...pr-1/dscho/branch-diff-v4 These tags are found at https://github.com/gitgitgadget/git Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Stefan Beller committed Aug 17, 2018 at 13:43 UTC 2543a64187bb80078e493268e683cb0661be754f

2 files changed +8 -6

range-diff.c

@@ -90,6 +90,7 @@ static int read_patches(const char *range, struct string_list *list)

90 strbuf_addch(&buf, '\n');

91 if (!util->diff_offset)

92 util->diff_offset = buf.len;

93 + strbuf_addch(&buf, ' ');

94 strbuf_addbuf(&buf, &line);

95 } else if (in_header) {

96 if (starts_with(line.buf, "Author: ")) {

@@ -126,6 +127,7 @@ static int read_patches(const char *range, struct string_list *list)

127 strbuf_addch(&buf, ' ');

128 strbuf_add(&buf, line.buf + 1, line.len - 1);

129 } else {

130 + strbuf_addch(&buf, ' ');

131 strbuf_addbuf(&buf, &line);

132 }

133

t/t3206-range-diff.sh

+6 -6

@@ -133,9 +133,9 @@ test_expect_success 'changed message' '

133 Z

134 + Also a silly comment here!

135 +

136 - Zdiff --git a/file b/file

137 - Z--- a/file

138 - Z+++ b/file

136 + Z diff --git a/file b/file

137 + Z --- a/file

138 + Z +++ b/file

139 3: 147e64e = 3: b9cb956 s/11/B/

140 4: a63e992 = 4: 8add5f1 s/12/B/

141 EOF

@@ -152,9 +152,9 @@ test_expect_success 'dual-coloring' '

152 : <RESET>

153 : <REVERSE><GREEN>+<RESET><BOLD> Also a silly comment here!<RESET>

154 : <REVERSE><GREEN>+<RESET>

155 - : diff --git a/file b/file<RESET>

156 - : <RED> --- a/file<RESET>

157 - : <GREEN> +++ b/file<RESET>

155 + : diff --git a/file b/file<RESET>

156 + : --- a/file<RESET>

157 + : +++ b/file<RESET>

158 :<RED>3: 0559556 <RESET><YELLOW>!<RESET><GREEN> 3: b9cb956<RESET><YELLOW> s/11/B/<RESET>

159 : <REVERSE><CYAN>@@ -10,7 +10,7 @@<RESET>

160 : 9<RESET>