git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/8] t3206: add color test for range-diff --dual-color

From
Stefan Beller <sbeller@google.com>
Date
Jul 28, 2018, 03:04 UTC
Message-ID
<20180728030448.192177-3-sbeller@google.com>
In-Reply-To
<20180728030448.192177-1-sbeller@google.com>

The 'expect'ed outcome is taken by running the 'range-diff |decode'; it is not meant as guidance, rather as a documentation of the current situation.

Signed-off-by: Stefan Beller <sbeller@google.com>
---
 t/t3206-range-diff.sh | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index 2237c7f4af9..ef652865cd7 100755
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -142,4 +142,43 @@ test_expect_success 'changed message' '
 	test_cmp expected actual
 '
 
+test_expect_success 'simple coloring' '
+	q_to_tab >expect <<-EOF &&
+	<YELLOW>1:  a4b3333 = 1:  f686024 s/5/A/<RESET>
+	<RED>2:  f51d370 <RESET><YELLOW>!<RESET><GREEN> 2:  4ab067d<RESET><YELLOW> s/4/A/<RESET>
+	    <REVERSE><CYAN>@@ -2,6 +2,8 @@<RESET>
+	     <RESET>
+	         s/4/A/<RESET>
+	     <RESET>
+	    <REVERSE><GREEN>+<RESET> <BOLD>   Also a silly comment here!<RESET>
+	    <REVERSE><GREEN>+<RESET>
+	     diff --git a/file b/file<RESET>
+	    <RED> --- a/file<RESET>
+	    <GREEN> +++ b/file<RESET>
+	<RED>3:  0559556 <RESET><YELLOW>!<RESET><GREEN> 3:  b9cb956<RESET><YELLOW> s/11/B/<RESET>
+	    <REVERSE><CYAN>@@ -10,7 +10,7 @@<RESET>
+	      9<RESET>
+	      10<RESET>
+	    <RED> -11<RESET>
+	    <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET>
+	    <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET>
+	      12<RESET>
+	      13<RESET>
+	      14<RESET>
+	<RED>4:  d966c5c <RESET><YELLOW>!<RESET><GREEN> 4:  8add5f1<RESET><YELLOW> s/12/B/<RESET>
+	    <REVERSE><CYAN>@@ -8,7 +8,7 @@<RESET>
+	    <CYAN> @@<RESET>
+	      9<RESET>
+	      10<RESET>
+	    <REVERSE><RED>-<RESET><FAINT> BB<RESET>
+	    <REVERSE><GREEN>+<RESET> <BOLD>B<RESET>
+	    <RED> -12<RESET>
+	    <GREEN> +B<RESET>
+	      13<RESET>
+	EOF
+	git range-diff changed...changed-message --color --dual-color >actual.raw &&
+	test_decode_color >actual <actual.raw &&
+	test_cmp expect actual
+'
+
 test_done
-- 
2.18.0.345.g5c9ce644c3-goog
Previous: Stefan BellerNext: Eric Sunshine
Message 3 of 26 in “Add color test for range-diff, simplify diff.c”
  1. 0/8 Add color test for range-diff, simplify diff.cStefan Beller, Jul 28, 2018
  2. 1/8 test_decode_color: understand FAINT and ITALICStefan Beller, Jul 28, 2018
  3. 2/8 t3206: add color test for range-diff --dual-colorStefan Beller, Jul 28, 2018
  4. Eric SunshineJul 28, 2018
  5. Stefan BellerJul 30, 2018
  6. 3/8 diff.c: simplify caller of emit_line_0Stefan Beller, Jul 28, 2018
  7. 4/8 diff.c: reorder arguments for emit_line_ws_markupStefan Beller, Jul 28, 2018
  8. 5/8 diff.c: add set_sign to emit_line_0Stefan Beller, Jul 28, 2018
  9. Eric SunshineJul 28, 2018
  10. 6/8 diff: use emit_line_0 once per lineStefan Beller, Jul 28, 2018
  11. 7/8 diff.c: compute reverse locally in emit_line_0Stefan Beller, Jul 28, 2018
  12. 8/8 diff.c: rewrite emit_line_0 more understandablyStefan Beller, Jul 28, 2018
  13. Eric SunshineJul 28, 2018
  14. 0/8 Add color test for range-diff, simplify diff.cStefan Beller, Jul 31, 2018
  15. 1/8 test_decode_color: understand FAINT and ITALICStefan Beller, Jul 31, 2018
  16. 2/8 t3206: add color test for range-diff --dual-colorStefan Beller, Jul 31, 2018
  17. Junio C HamanoJul 31, 2018
  18. 3/8 diff.c: simplify caller of emit_line_0Stefan Beller, Jul 31, 2018
  19. 4/8 diff.c: reorder arguments for emit_line_ws_markupStefan Beller, Jul 31, 2018
  20. 5/8 diff.c: add set_sign to emit_line_0Stefan Beller, Jul 31, 2018
  21. 6/8 diff: use emit_line_0 once per lineStefan Beller, Jul 31, 2018
  22. 7/8 diff.c: compute reverse locally in emit_line_0Stefan Beller, Jul 31, 2018
  23. 8/8 diff.c: rewrite emit_line_0 more understandablyStefan Beller, Jul 31, 2018
  24. Junio C HamanoAug 1, 2018
  25. Stefan BellerAug 1, 2018
  26. Junio C HamanoAug 2, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.