Fetch one diff first, output a separation line for the rest, if any

ymattw · Nov 3, 2024 · 30466fb · 30466fb
1 parent 3b924b9
commit 30466fb
Show file tree

Hide file tree

Showing 33 changed files with 128 additions and 55 deletions.
diff --git a/tests/diff-ru-bin/out.normal b/tests/diff-ru-bin/out.normal
@@ -10,8 +10,10 @@
 [0m[0m ../../cdiff.py -c always -s < in.diff > out.side-by-side
 [0m[0m ../../cdiff.py -c always -s < in.diff -w70 > out.w70
 [0m[32m+# EOF
+[0m[1;36m───────────────────────────────────────────────────────────────────────────────
 [0m[36mBinary files a/foo.pdf and b/foo.pdf differ
-[0m[33m[0m[33m[0m[36mdiff -ru a/foo.txt b/foo.txt
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mdiff -ru a/foo.txt b/foo.txt
 [0m[33m--- a/foo.txt	2013-02-23 19:55:03.000000000 +0800
 [0m[33m+++ b/foo.txt	2013-02-23 19:55:10.000000000 +0800
 [0m[1;34m@@ -1,2 +1,2 @@

diff --git a/tests/diff-ru-bin/out.side-by-side b/tests/diff-ru-bin/out.side-by-side
@@ -9,8 +9,10 @@
 [33m5[0m [0m../../cdiff.py -c always -s < in.diff > out.side-by-side[0m                         [0m[33m4[0m [0m../../cdiff.py -c always -s < in.diff > out.side-by-side[0m
 [33m6[0m [0m../../cdiff.py -c always -s < in.diff -w70 > out.w70[0m                             [0m[33m5[0m [0m../../cdiff.py -c always -s < in.diff -w70 > out.w70[0m
 [33m [0m                                                                                  [0m[33m6[0m [32m# EOF[0m
-[36mBinary files a/foo.pdf and b/foo.pdf differ
-[0m[33m[0m[33m[0m[36mdiff -ru a/foo.txt b/foo.txt
+[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mBinary files a/foo.pdf and b/foo.pdf differ
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mdiff -ru a/foo.txt b/foo.txt
 [0m[33m--- a/foo.txt	2013-02-23 19:55:03.000000000 +0800
 [0m[33m+++ b/foo.txt	2013-02-23 19:55:10.000000000 +0800
 [0m[1;34m@@ -1,2 +1,2 @@

diff --git a/tests/diff-ru-bin/out.w70 b/tests/diff-ru-bin/out.w70
@@ -9,8 +9,10 @@
 [33m5[0m [0m../../cdiff.py -c always -s < in.diff > out.side-by-side[0m               [0m[33m4[0m [0m../../cdiff.py -c always -s < in.diff > out.side-by-side[0m
 [33m6[0m [0m../../cdiff.py -c always -s < in.diff -w70 > out.w70[0m                   [0m[33m5[0m [0m../../cdiff.py -c always -s < in.diff -w70 > out.w70[0m
 [33m [0m                                                                        [0m[33m6[0m [32m# EOF[0m
-[36mBinary files a/foo.pdf and b/foo.pdf differ
-[0m[33m[0m[33m[0m[36mdiff -ru a/foo.txt b/foo.txt
+[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mBinary files a/foo.pdf and b/foo.pdf differ
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mdiff -ru a/foo.txt b/foo.txt
 [0m[33m--- a/foo.txt	2013-02-23 19:55:03.000000000 +0800
 [0m[33m+++ b/foo.txt	2013-02-23 19:55:10.000000000 +0800
 [0m[1;34m@@ -1,2 +1,2 @@

diff --git a/tests/diff-ru-bin/out.w70.wrap b/tests/diff-ru-bin/out.w70.wrap
@@ -10,8 +10,10 @@
 [33m5[0m [0m../../cdiff.py -c always -s < in.diff > out.side-by-side[0m               [0m[33m4[0m [0m../../cdiff.py -c always -s < in.diff > out.side-by-side[0m
 [33m6[0m [0m../../cdiff.py -c always -s < in.diff -w70 > out.w70[0m                   [0m[33m5[0m [0m../../cdiff.py -c always -s < in.diff -w70 > out.w70[0m
 [33m [0m                                                                        [0m[33m6[0m [32m# EOF[0m
-[36mBinary files a/foo.pdf and b/foo.pdf differ
-[0m[33m[0m[33m[0m[36mdiff -ru a/foo.txt b/foo.txt
+[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mBinary files a/foo.pdf and b/foo.pdf differ
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mdiff -ru a/foo.txt b/foo.txt
 [0m[33m--- a/foo.txt	2013-02-23 19:55:03.000000000 +0800
 [0m[33m+++ b/foo.txt	2013-02-23 19:55:10.000000000 +0800
 [0m[1;34m@@ -1,2 +1,2 @@

diff --git a/tests/diff-ru/out.normal b/tests/diff-ru/out.normal
@@ -10,14 +10,19 @@
 [0m[0m ../../cdiff.py -c always -s in.diff > out.side-by-side
 [0m[0m ../../cdiff.py -c always -s in.diff -w70 > out.w70
 [0m[32m+# EOF
+[0m[1;36m───────────────────────────────────────────────────────────────────────────────
 [0m[36mOnly in a: a1
-[0m[33m[0m[33m[0m[36mOnly in b: b1
-[0m[33m[0m[33m[0m[36mdiff -ru a/common/foo.txt b/common/foo.txt
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in b: b1
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mdiff -ru a/common/foo.txt b/common/foo.txt
 [0m[33m--- a/common/foo.txt	2013-02-22 20:28:32.000000000 +0800
 [0m[33m+++ b/common/foo.txt	2013-02-22 20:30:18.000000000 +0800
 [0m[1;34m@@ -1 +1 @@
 [0m[1;31m-[0m[31m[7m[31mHello
 [0m[31m[0m[32m+[0m[32m[7m[32mworld
-[0m[32m[0m[36mOnly in b: date.txt
-[0m[33m[0m[33m[0m[36mOnly in a: time.txt
+[0m[32m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in b: date.txt
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in a: time.txt
 [0m[33m[0m[33m[0m
diff --git a/tests/diff-ru/out.side-by-side b/tests/diff-ru/out.side-by-side
@@ -9,13 +9,18 @@
 [33m5[0m [0m../../cdiff.py -c always -s in.diff > out.side-by-side[0m                           [0m[33m4[0m [0m../../cdiff.py -c always -s in.diff > out.side-by-side[0m
 [33m6[0m [0m../../cdiff.py -c always -s in.diff -w70 > out.w70[0m                               [0m[33m5[0m [0m../../cdiff.py -c always -s in.diff -w70 > out.w70[0m
 [33m [0m                                                                                  [0m[33m6[0m [32m# EOF[0m
-[36mOnly in a: a1
-[0m[33m[0m[33m[0m[36mOnly in b: b1
-[0m[33m[0m[33m[0m[36mdiff -ru a/common/foo.txt b/common/foo.txt
+[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in a: a1
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in b: b1
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mdiff -ru a/common/foo.txt b/common/foo.txt
 [0m[33m--- a/common/foo.txt	2013-02-22 20:28:32.000000000 +0800
 [0m[33m+++ b/common/foo.txt	2013-02-22 20:30:18.000000000 +0800
 [0m[1;34m@@ -1 +1 @@
 [0m[33m1[0m [31m[7m[31mHello[0m                                                                            [0m[33m1[0m [32m[7m[32mworld[0m
-[36mOnly in b: date.txt
-[0m[33m[0m[33m[0m[36mOnly in a: time.txt
+[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in b: date.txt
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in a: time.txt
 [0m[33m[0m[33m[0m
diff --git a/tests/diff-ru/out.w70 b/tests/diff-ru/out.w70
@@ -9,13 +9,18 @@
 [33m5[0m [0m../../cdiff.py -c always -s in.diff > out.side-by-side[0m                 [0m[33m4[0m [0m../../cdiff.py -c always -s in.diff > out.side-by-side[0m
 [33m6[0m [0m../../cdiff.py -c always -s in.diff -w70 > out.w70[0m                     [0m[33m5[0m [0m../../cdiff.py -c always -s in.diff -w70 > out.w70[0m
 [33m [0m                                                                        [0m[33m6[0m [32m# EOF[0m
-[36mOnly in a: a1
-[0m[33m[0m[33m[0m[36mOnly in b: b1
-[0m[33m[0m[33m[0m[36mdiff -ru a/common/foo.txt b/common/foo.txt
+[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in a: a1
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in b: b1
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mdiff -ru a/common/foo.txt b/common/foo.txt
 [0m[33m--- a/common/foo.txt	2013-02-22 20:28:32.000000000 +0800
 [0m[33m+++ b/common/foo.txt	2013-02-22 20:30:18.000000000 +0800
 [0m[1;34m@@ -1 +1 @@
 [0m[33m1[0m [31m[7m[31mHello[0m                                                                  [0m[33m1[0m [32m[7m[32mworld[0m
-[36mOnly in b: date.txt
-[0m[33m[0m[33m[0m[36mOnly in a: time.txt
+[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in b: date.txt
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in a: time.txt
 [0m[33m[0m[33m[0m
diff --git a/tests/diff-ru/out.w70.wrap b/tests/diff-ru/out.w70.wrap
@@ -10,13 +10,18 @@
 [33m5[0m [0m../../cdiff.py -c always -s in.diff > out.side-by-side[0m                 [0m[33m4[0m [0m../../cdiff.py -c always -s in.diff > out.side-by-side[0m
 [33m6[0m [0m../../cdiff.py -c always -s in.diff -w70 > out.w70[0m                     [0m[33m5[0m [0m../../cdiff.py -c always -s in.diff -w70 > out.w70[0m
 [33m [0m                                                                        [0m[33m6[0m [32m# EOF[0m
-[36mOnly in a: a1
-[0m[33m[0m[33m[0m[36mOnly in b: b1
-[0m[33m[0m[33m[0m[36mdiff -ru a/common/foo.txt b/common/foo.txt
+[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in a: a1
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in b: b1
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mdiff -ru a/common/foo.txt b/common/foo.txt
 [0m[33m--- a/common/foo.txt	2013-02-22 20:28:32.000000000 +0800
 [0m[33m+++ b/common/foo.txt	2013-02-22 20:30:18.000000000 +0800
 [0m[1;34m@@ -1 +1 @@
 [0m[33m1[0m [31m[7m[31mHello[0m                                                                  [0m[33m1[0m [32m[7m[32mworld[0m
-[36mOnly in b: date.txt
-[0m[33m[0m[33m[0m[36mOnly in a: time.txt
+[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in b: date.txt
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mOnly in a: time.txt
 [0m[33m[0m[33m[0m
diff --git a/tests/git-bin/out.normal b/tests/git-bin/out.normal
@@ -8,10 +8,12 @@
 [0m[0m wkhtmltopdf --page-size A4 $INPUT $OUTPUT  # very very long comments ends here
 [0m[32m+
 [0m[32m+# EOF
+[0m[1;36m───────────────────────────────────────────────────────────────────────────────
 [0m[36mdiff --git a/example.pdf b/example.pdf
 [0m[36mindex 1eacfd8..3696851 100644
 [0m[36mBinary files a/example.pdf and b/example.pdf differ
-[0m[33m[0m[33m[0m[36mdiff --git a/foo.html b/foo.html
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mdiff --git a/foo.html b/foo.html
 [0m[36mindex d2fd3fb..13afa6e 100644
 [0m[33m--- a/foo.html
 [0m[33m+++ b/foo.html
@@ -21,6 +23,7 @@
 [0m[32m[0m[0m <html>
 [0m[0m 
 [0m[0m <head>
+[0m[1;36m───────────────────────────────────────────────────────────────────────────────
 [0m[36mdiff --git a/foo.pdf b/foo.pdf
 [0m[36mindex 0e90017..3c3b90d 100644
 [0m[36mBinary files a/foo.pdf and b/foo.pdf differ

diff --git a/tests/git-bin/out.side-by-side b/tests/git-bin/out.side-by-side
@@ -8,10 +8,12 @@
 [33m15[0m [0mwkhtmltopdf --page-size A4 $INPUT $OUTPUT  # very very long comments ends here[0m   [0m[33m15[0m [0mwkhtmltopdf --page-size A4 $INPUT $OUTPUT  # very very long comments ends here[0m
 [33m  [0m                                                                                  [0m[33m16[0m [32m[0m
 [33m  [0m                                                                                  [0m[33m17[0m [32m# EOF[0m
-[36mdiff --git a/example.pdf b/example.pdf
+[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mdiff --git a/example.pdf b/example.pdf
 [0m[36mindex 1eacfd8..3696851 100644
 [0m[36mBinary files a/example.pdf and b/example.pdf differ
-[0m[33m[0m[33m[0m[36mdiff --git a/foo.html b/foo.html
+[0m[33m[0m[33m[0m[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mdiff --git a/foo.html b/foo.html
 [0m[36mindex d2fd3fb..13afa6e 100644
 [0m[33m--- a/foo.html
 [0m[33m+++ b/foo.html
@@ -20,7 +22,8 @@
 [33m2[0m [0m<html>[0m                                                                           [0m[33m2[0m [0m<html>[0m
 [33m3[0m [0m[0m                                                                                 [0m[33m3[0m [0m[0m
 [33m4[0m [0m<head>[0m                                                                           [0m[33m4[0m [0m<head>[0m
-[36mdiff --git a/foo.pdf b/foo.pdf
+[1;36m───────────────────────────────────────────────────────────────────────────────
+[0m[36mdiff --git a/foo.pdf b/foo.pdf
 [0m[36mindex 0e90017..3c3b90d 100644
 [0m[36mBinary files a/foo.pdf and b/foo.pdf differ
 [0m[33m[0m[33m[0m