From 59c7317a6dd2e647646198620972977ad417626c Mon Sep 17 00:00:00 2001
From: rbong <r.l.bongers@gmail.com>
Date: Wed, 31 Jul 2024 15:17:53 -0400
Subject: [PATCH] Add extended character tests

---
 t/data/graph_branch_end_extended_out          | 16 +++++++++
 t/data/graph_merge_complex_extended_out       | 13 +++++++
 t/data/graph_merge_cross_extended_out         | 16 +++++++++
 t/data/graph_merge_extended_out               | 10 ++++++
 t/data/graph_merge_multiline_extended_out     | 17 +++++++++
 t/data/graph_octopus_crossover_extended_out   | 13 +++++++
 .../graph_octopus_crossover_left_extended_out | 12 +++++++
 t/data/graph_octopus_extended_out             | 11 ++++++
 t/data/graph_octopus_left_extended_out        | 12 +++++++
 t/data/graph_simple_extended_out              |  5 +++
 t/data/graph_tangle_extended_out              | 34 ++++++++++++++++++
 t/data/graph_tangle_range_extended_out        | 16 +++++++++
 t/t_graph_branch_end.sh                       | 17 +++++++--
 t/t_graph_merge.sh                            | 17 +++++++--
 t/t_graph_merge_complex.sh                    | 17 +++++++--
 t/t_graph_merge_cross.sh                      | 17 +++++++--
 t/t_graph_merge_multiline.sh                  | 17 +++++++--
 t/t_graph_octopus.sh                          | 17 +++++++--
 t/t_graph_octopus_crossover.sh                | 17 +++++++--
 t/t_graph_octopus_crossover_left.sh           | 17 +++++++--
 t/t_graph_octopus_left.sh                     | 17 +++++++--
 t/t_graph_simple.sh                           | 17 +++++++--
 t/t_graph_tangle.sh                           | 35 +++++++++++++++----
 23 files changed, 344 insertions(+), 36 deletions(-)
 create mode 100644 t/data/graph_branch_end_extended_out
 create mode 100644 t/data/graph_merge_complex_extended_out
 create mode 100644 t/data/graph_merge_cross_extended_out
 create mode 100644 t/data/graph_merge_extended_out
 create mode 100644 t/data/graph_merge_multiline_extended_out
 create mode 100644 t/data/graph_octopus_crossover_extended_out
 create mode 100644 t/data/graph_octopus_crossover_left_extended_out
 create mode 100644 t/data/graph_octopus_extended_out
 create mode 100644 t/data/graph_octopus_left_extended_out
 create mode 100644 t/data/graph_simple_extended_out
 create mode 100644 t/data/graph_tangle_extended_out
 create mode 100644 t/data/graph_tangle_range_extended_out

diff --git a/t/data/graph_branch_end_extended_out b/t/data/graph_branch_end_extended_out
new file mode 100644
index 0000000..337d016
--- /dev/null
+++ b/t/data/graph_branch_end_extended_out
@@ -0,0 +1,16 @@
+ 1-e
+
+    2-b
+    3-b
+    4-b
+    2-a
+
+     1-c
+     3-a
+  
+     4-a
+ 
+  1-b
+
+ 1-a
+ 
diff --git a/t/data/graph_merge_complex_extended_out b/t/data/graph_merge_complex_extended_out
new file mode 100644
index 0000000..5be1272
--- /dev/null
+++ b/t/data/graph_merge_complex_extended_out
@@ -0,0 +1,13 @@
+ 1-d
+
+   3-b
+   2-b
+   1-c
+
+   3-a
+   2-a
+ 
+    1-b
+
+ 1-a
+ 
diff --git a/t/data/graph_merge_cross_extended_out b/t/data/graph_merge_cross_extended_out
new file mode 100644
index 0000000..8703f3b
--- /dev/null
+++ b/t/data/graph_merge_cross_extended_out
@@ -0,0 +1,16 @@
+ 1-e
+
+   1-d
+   2-c
+   3-b
+   2-b
+
+   2-a
+   1-c
+ 
+    3-a
+ 
+  1-b
+
+ 1-a
+ 
diff --git a/t/data/graph_merge_extended_out b/t/data/graph_merge_extended_out
new file mode 100644
index 0000000..6dc7ee2
--- /dev/null
+++ b/t/data/graph_merge_extended_out
@@ -0,0 +1,10 @@
+ 1-e
+ 1-d
+
+  2-b
+  2-a
+  1-c
+
+ 1-b
+ 1-a
+ 
diff --git a/t/data/graph_merge_multiline_extended_out b/t/data/graph_merge_multiline_extended_out
new file mode 100644
index 0000000..c67ccdd
--- /dev/null
+++ b/t/data/graph_merge_multiline_extended_out
@@ -0,0 +1,17 @@
+ 1-e
+ 1-e
+ 1-d
+ 1-d
+
+  2-b
+  2-b
+  2-a
+  2-a
+  1-c
+  1-c
+
+ 1-b
+ 1-b
+ 1-a
+  1-a
+ 
diff --git a/t/data/graph_octopus_crossover_extended_out b/t/data/graph_octopus_crossover_extended_out
new file mode 100644
index 0000000..408b86a
--- /dev/null
+++ b/t/data/graph_octopus_crossover_extended_out
@@ -0,0 +1,13 @@
+ 1-b
+  2-b
+ 
+     5-a
+
+    4-a
+
+   3-a
+
+  2-a
+
+ 1-a
+ 
diff --git a/t/data/graph_octopus_crossover_left_extended_out b/t/data/graph_octopus_crossover_left_extended_out
new file mode 100644
index 0000000..796a777
--- /dev/null
+++ b/t/data/graph_octopus_crossover_left_extended_out
@@ -0,0 +1,12 @@
+ 1-c
+  2-b
+
+    1-b
+    4-a
+
+   3-a
+
+  2-a
+
+ 1-a
+ 
diff --git a/t/data/graph_octopus_extended_out b/t/data/graph_octopus_extended_out
new file mode 100644
index 0000000..701b40a
--- /dev/null
+++ b/t/data/graph_octopus_extended_out
@@ -0,0 +1,11 @@
+ 1-c
+
+    4-a
+    3-a
+  
+   2-a
+ 
+  1-b
+
+ 1-a
+ 
diff --git a/t/data/graph_octopus_left_extended_out b/t/data/graph_octopus_left_extended_out
new file mode 100644
index 0000000..27bf87c
--- /dev/null
+++ b/t/data/graph_octopus_left_extended_out
@@ -0,0 +1,12 @@
+ 1-c
+  2-b
+
+    4-a
+    3-a
+  
+   2-a
+ 
+  1-b
+
+ 1-a
+ 
diff --git a/t/data/graph_simple_extended_out b/t/data/graph_simple_extended_out
new file mode 100644
index 0000000..58cb38a
--- /dev/null
+++ b/t/data/graph_simple_extended_out
@@ -0,0 +1,5 @@
+ 1-d
+ 1-c
+ 1-b
+ 1-a
+ 
diff --git a/t/data/graph_tangle_extended_out b/t/data/graph_tangle_extended_out
new file mode 100644
index 0000000..602a60e
--- /dev/null
+++ b/t/data/graph_tangle_extended_out
@@ -0,0 +1,34 @@
+ 1-l
+
+  1-k
+
+    2-d
+    1-j
+  
+     3-c
+ 
+      4-a
+
+ 1-i
+
+  1-h
+
+   2-c
+ 
+    1-g
+    3-b
+  
+   2-b
+ 
+    1-f
+
+   3-a
+   2-a
+   1-e
+   1-d
+
+  1-c
+
+ 1-b
+ 1-a
+ 
diff --git a/t/data/graph_tangle_range_extended_out b/t/data/graph_tangle_range_extended_out
new file mode 100644
index 0000000..fe73dff
--- /dev/null
+++ b/t/data/graph_tangle_range_extended_out
@@ -0,0 +1,16 @@
+ 2-d
+ 1-i
+
+  
+   
+ 1-h
+
+  3-b
+ 
+  
+   
+ 1-g
+ 1-f
+
+ 
+  
diff --git a/t/t_graph_branch_end.sh b/t/t_graph_branch_end.sh
index ae676fd..5bb8ed7 100755
--- a/t/t_graph_branch_end.sh
+++ b/t/t_graph_branch_end.sh
@@ -41,10 +41,21 @@ git_commit_tag 2-b
 git_checkout 1-c
 git_merge -m 1-e 2-b 3-b 4-b
 
-VIM_OUT="$TMP/out"
+FLOG_CMD="Flog -order=date -format=%s"
+
+VIM_OUT="$TMP/basic_out"
+run_vim_command <<EOF
+$FLOG_CMD
+silent w $VIM_OUT
+EOF
+
+diff_data "$VIM_OUT" "graph_branch_end_out"
+
+VIM_OUT="$TMP/extended_out"
 run_vim_command <<EOF
-Flog -order=date -format=%s
+let g:flog_enable_extended_chars = 1
+$FLOG_CMD
 silent w $VIM_OUT
 EOF
 
-diff_data "$TMP/out" "graph_branch_end_out"
+diff_data "$VIM_OUT" "graph_branch_end_extended_out"
diff --git a/t/t_graph_merge.sh b/t/t_graph_merge.sh
index 17b6d18..d4036ba 100755
--- a/t/t_graph_merge.sh
+++ b/t/t_graph_merge.sh
@@ -23,10 +23,21 @@ git_checkout 1-c
 git_merge -m 1-d 2-b
 git_commit -m 1-e
 
-VIM_OUT="$TMP/out"
+FLOG_CMD="Flog -format=%s"
+
+VIM_OUT="$TMP/basic_out"
+run_vim_command <<EOF
+$FLOG_CMD
+silent w $VIM_OUT
+EOF
+
+diff_data "$VIM_OUT" "graph_merge_out"
+
+VIM_OUT="$TMP/extended_out"
 run_vim_command <<EOF
-Flog -format=%s
+let g:flog_enable_extended_chars = 1
+$FLOG_CMD
 silent w $VIM_OUT
 EOF
 
-diff_data "$TMP/out" "graph_merge_out"
+diff_data "$VIM_OUT" "graph_merge_extended_out"
diff --git a/t/t_graph_merge_complex.sh b/t/t_graph_merge_complex.sh
index b40c0b9..31e662a 100755
--- a/t/t_graph_merge_complex.sh
+++ b/t/t_graph_merge_complex.sh
@@ -26,10 +26,21 @@ git_checkout 1-b
 git_merge -m 1-c 2-a 3-a
 git_merge -m 1-d 2-b 3-b
 
-VIM_OUT="$TMP/out"
+FLOG_CMD="Flog -format=%s"
+
+VIM_OUT="$TMP/basic_out"
+run_vim_command <<EOF
+$FLOG_CMD
+silent w $VIM_OUT
+EOF
+
+diff_data "$VIM_OUT" "graph_merge_complex_out"
+
+VIM_OUT="$TMP/extended_out"
 run_vim_command <<EOF
-Flog -format=%s
+let g:flog_enable_extended_chars = 1
+$FLOG_CMD
 silent w $VIM_OUT
 EOF
 
-diff_data "$TMP/out" "graph_merge_complex_out"
+diff_data "$VIM_OUT" "graph_merge_complex_extended_out"
diff --git a/t/t_graph_merge_cross.sh b/t/t_graph_merge_cross.sh
index f854914..57bfb00 100755
--- a/t/t_graph_merge_cross.sh
+++ b/t/t_graph_merge_cross.sh
@@ -41,10 +41,21 @@ git_checkout 1-c
 git_commit_tag 1-d
 git_merge -m 1-e 2-c 3-b
 
-VIM_OUT="$TMP/out"
+FLOG_CMD="Flog -order=date -format=%s"
+
+VIM_OUT="$TMP/basic_out"
+run_vim_command <<EOF
+$FLOG_CMD
+silent w $VIM_OUT
+EOF
+
+diff_data "$VIM_OUT" "graph_merge_cross_out"
+
+VIM_OUT="$TMP/extended_out"
 run_vim_command <<EOF
-Flog -order=date -format=%s
+let g:flog_enable_extended_chars = 1
+$FLOG_CMD
 silent w $VIM_OUT
 EOF
 
-diff_data "$TMP/out" "graph_merge_cross_out"
+diff_data "$VIM_OUT" "graph_merge_cross_extended_out"
diff --git a/t/t_graph_merge_multiline.sh b/t/t_graph_merge_multiline.sh
index c183b02..cecc08b 100755
--- a/t/t_graph_merge_multiline.sh
+++ b/t/t_graph_merge_multiline.sh
@@ -23,10 +23,21 @@ git_checkout 1-c
 git_merge -m 1-d 2-b
 git_commit_tag 1-e
 
-VIM_OUT="$TMP/out"
+FLOG_CMD="Flog -format=%s%n%s"
+
+VIM_OUT="$TMP/basic_out"
+run_vim_command <<EOF
+$FLOG_CMD
+silent w $VIM_OUT
+EOF
+
+diff_data "$VIM_OUT" "graph_merge_multiline_out"
+
+VIM_OUT="$TMP/extended_out"
 run_vim_command <<EOF
-Flog -format=%s%n%s
+let g:flog_enable_extended_chars = 1
+$FLOG_CMD
 silent w $VIM_OUT
 EOF
 
-diff_data "$TMP/out" "graph_merge_multiline_out"
+diff_data "$VIM_OUT" "graph_merge_multiline_extended_out"
diff --git a/t/t_graph_octopus.sh b/t/t_graph_octopus.sh
index 0ae0d73..25601d7 100755
--- a/t/t_graph_octopus.sh
+++ b/t/t_graph_octopus.sh
@@ -28,10 +28,21 @@ git_commit_tag 4-a
 git_checkout 1-b
 git_merge -m 1-c 2-a 3-a 4-a
 
-VIM_OUT="$TMP/out"
+FLOG_CMD="Flog -format=%s"
+
+VIM_OUT="$TMP/basic_out"
+run_vim_command <<EOF
+$FLOG_CMD
+silent w $VIM_OUT
+EOF
+
+diff_data "$VIM_OUT" "graph_octopus_out"
+
+VIM_OUT="$TMP/extended_out"
 run_vim_command <<EOF
-Flog -format=%s
+let g:flog_enable_extended_chars = 1
+$FLOG_CMD
 silent w $VIM_OUT
 EOF
 
-diff_data "$TMP/out" "graph_octopus_out"
+diff_data "$VIM_OUT" "graph_octopus_extended_out"
diff --git a/t/t_graph_octopus_crossover.sh b/t/t_graph_octopus_crossover.sh
index 2b5ccd8..a5d3b98 100755
--- a/t/t_graph_octopus_crossover.sh
+++ b/t/t_graph_octopus_crossover.sh
@@ -35,10 +35,21 @@ git_tag 2-b
 git_checkout 1-a
 git_commit_tag 1-b
 
-VIM_OUT="$TMP/out"
+FLOG_CMD="Flog -format=%s -rev=1-b -rev=2-b"
+
+VIM_OUT="$TMP/basic_out"
+run_vim_command <<EOF
+$FLOG_CMD
+silent w $VIM_OUT
+EOF
+
+diff_data "$VIM_OUT" "graph_octopus_crossover_out"
+
+VIM_OUT="$TMP/extended_out"
 run_vim_command <<EOF
-Flog -format=%s -rev=1-b -rev=2-b
+let g:flog_enable_extended_chars = 1
+$FLOG_CMD
 silent w $VIM_OUT
 EOF
 
-diff_data "$TMP/out" "graph_octopus_crossover_out"
+diff_data "$VIM_OUT" "graph_octopus_crossover_extended_out"
diff --git a/t/t_graph_octopus_crossover_left.sh b/t/t_graph_octopus_crossover_left.sh
index 1c2c30c..3a3eed8 100755
--- a/t/t_graph_octopus_crossover_left.sh
+++ b/t/t_graph_octopus_crossover_left.sh
@@ -35,10 +35,21 @@ sleep 1
 git_checkout 1-b
 git_commit_tag 1-c
 
-VIM_OUT="$TMP/out"
+FLOG_CMD="Flog -format=%s -rev=1-c -rev=2-b"
+
+VIM_OUT="$TMP/basic_out"
+run_vim_command <<EOF
+$FLOG_CMD
+silent w $VIM_OUT
+EOF
+
+diff_data "$VIM_OUT" "graph_octopus_crossover_left_out"
+
+VIM_OUT="$TMP/extended_out"
 run_vim_command <<EOF
-Flog -format=%s -rev=1-c -rev=2-b
+let g:flog_enable_extended_chars = 1
+$FLOG_CMD
 silent w $VIM_OUT
 EOF
 
-diff_data "$TMP/out" "graph_octopus_crossover_left_out"
+diff_data "$VIM_OUT" "graph_octopus_crossover_left_extended_out"
diff --git a/t/t_graph_octopus_left.sh b/t/t_graph_octopus_left.sh
index 6401639..a080904 100755
--- a/t/t_graph_octopus_left.sh
+++ b/t/t_graph_octopus_left.sh
@@ -32,10 +32,21 @@ git_tag 2-b
 git_checkout 1-b
 git_commit_tag 1-c
 
-VIM_OUT="$TMP/out"
+FLOG_CMD="Flog -format=%s -rev=1-c -rev=2-b"
+
+VIM_OUT="$TMP/basic_out"
+run_vim_command <<EOF
+$FLOG_CMD
+silent w $VIM_OUT
+EOF
+
+diff_data "$VIM_OUT" "graph_octopus_left_out"
+
+VIM_OUT="$TMP/extended_out"
 run_vim_command <<EOF
-Flog -format=%s -rev=1-c -rev=2-b
+let g:flog_enable_extended_chars = 1
+$FLOG_CMD
 silent w $VIM_OUT
 EOF
 
-diff_data "$TMP/out" "graph_octopus_left_out"
+diff_data "$VIM_OUT" "graph_octopus_left_extended_out"
diff --git a/t/t_graph_simple.sh b/t/t_graph_simple.sh
index 5d74a24..f9d4b1b 100755
--- a/t/t_graph_simple.sh
+++ b/t/t_graph_simple.sh
@@ -16,10 +16,21 @@ cd "$WORKTREE"
 
 git_commit_tag 1-a 1-b 1-c 1-d
 
-VIM_OUT="$TMP/out"
+FLOG_CMD="Flog -format=%s"
+
+VIM_OUT="$TMP/basic_out"
+run_vim_command <<EOF
+$FLOG_CMD
+silent w $VIM_OUT
+EOF
+
+diff_data "$VIM_OUT" "graph_simple_out"
+
+VIM_OUT="$TMP/extended_out"
 run_vim_command <<EOF
-Flog -format=%s
+let g:flog_enable_extended_chars = 1
+$FLOG_CMD
 silent w $VIM_OUT
 EOF
 
-diff_data "$TMP/out" "graph_simple_out"
+diff_data "$VIM_OUT" "graph_simple_extended_out"
diff --git a/t/t_graph_tangle.sh b/t/t_graph_tangle.sh
index f0265f2..c0d7af5 100755
--- a/t/t_graph_tangle.sh
+++ b/t/t_graph_tangle.sh
@@ -60,17 +60,40 @@ git_checkout 1-j
 git_merge -m 1-k 3-c 4-a
 git_merge -m 1-l 2-d
 
-VIM_OUT="$TMP/out"
+FLOG_CMD="Flog -order=date -format=%s"
+
+VIM_OUT="$TMP/basic_out"
 run_vim_command <<EOF
-Flog -order=date -format=%s
+$FLOG_CMD
 silent w $VIM_OUT
 EOF
 
-diff_data "$TMP/out" "graph_tangle_out"
+diff_data "$VIM_OUT" "graph_tangle_out"
+
+VIM_OUT="$TMP/extended_out"
+run_vim_command <<EOF
+let g:flog_enable_extended_chars = 1
+$FLOG_CMD
+silent w $VIM_OUT
+EOF
+
+diff_data "$VIM_OUT" "graph_tangle_extended_out"
+
+FLOG_RANGE_CMD="Flog -format=%s -rev=2-c..2-d"
 
+VIM_OUT="$TMP/basic_range_out"
 run_vim_command <<EOF
-Flog -format=%s -rev=2-c..2-d
-silent w! $VIM_OUT
+$FLOG_RANGE_CMD
+silent w $VIM_OUT
+EOF
+
+diff_data "$VIM_OUT" "graph_tangle_range_out"
+
+VIM_OUT="$TMP/extended_range_out"
+run_vim_command <<EOF
+let g:flog_enable_extended_chars = 1
+$FLOG_RANGE_CMD
+silent w $VIM_OUT
 EOF
 
-diff_data "$TMP/out" "graph_tangle_range_out"
+diff_data "$VIM_OUT" "graph_tangle_range_extended_out"