mergetools: vimdiff: add tests for layout with REMOTE as the target
Add some tests to make sure that now "REMOTE" can be used as a target (ie. can be used together with the "@" marker) inside "mergetool.vimdiff.layout" Signed-off-by: Fernando Ramos <greenfoo@u92.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Fernando Ramos committed
Mar 25, 2025 at 23:23 UTC
93bab2d04be7ac304a5dd899daccd3e357126f79
1 file changed
+10
-1
mergetools/vimdiff
+10
-1
@@ -532,7 +532,7 @@ run_unit_tests () {
532
# Function to make sure that we don't break anything when modifying this
533
# script.
534
535
- NUMBER_OF_TEST_CASES=16
535
+ NUMBER_OF_TEST_CASES=19
536
537
TEST_CASE_01="(LOCAL,BASE,REMOTE)/MERGED" # default behaviour
538
TEST_CASE_02="@LOCAL,REMOTE" # when using vimdiff1
@@ -550,6 +550,9 @@ run_unit_tests () {
550
TEST_CASE_14="BASE,REMOTE+BASE,LOCAL"
551
TEST_CASE_15=" (( (LOCAL , BASE , REMOTE) / MERGED)) +(BASE) , LOCAL+ BASE , REMOTE+ (((LOCAL / BASE / REMOTE)) , MERGED ) "
552
TEST_CASE_16="LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE + (LOCAL / BASE / REMOTE),MERGED"
553
+ TEST_CASE_17="(LOCAL,@BASE,REMOTE)/MERGED"
554
+ TEST_CASE_18="LOCAL,@REMOTE"
555
+ TEST_CASE_19="@REMOTE"
556
557
EXPECTED_CMD_01="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 2b | wincmd l | 3b | wincmd j | 4b | execute 'tabdo windo diffthis' | tabfirst\""
558
EXPECTED_CMD_02="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | 1b | wincmd l | 3b | execute 'tabdo windo diffthis' | tabfirst\""
@@ -567,6 +570,9 @@ run_unit_tests () {
570
EXPECTED_CMD_14="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | 2b | wincmd l | 3b | tabnew | leftabove vertical split | 2b | wincmd l | 1b | execute 'tabdo windo diffthis' | tabfirst\""
571
EXPECTED_CMD_15="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabnew | leftabove vertical split | 2b | wincmd l | 1b | tabnew | leftabove vertical split | 2b | wincmd l | 3b | tabnew | leftabove vertical split | leftabove split | 1b | wincmd j | leftabove split | 2b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
572
EXPECTED_CMD_16="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabnew | leftabove vertical split | 2b | wincmd l | 1b | tabnew | leftabove vertical split | 2b | wincmd l | 3b | tabnew | leftabove vertical split | leftabove split | 1b | wincmd j | leftabove split | 2b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
573
+ EXPECTED_CMD_17="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 2b | wincmd l | 3b | wincmd j | 4b | execute 'tabdo windo diffthis' | tabfirst\""
574
+ EXPECTED_CMD_18="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | 1b | wincmd l | 3b | execute 'tabdo windo diffthis' | tabfirst\""
575
+ EXPECTED_CMD_19="-c \"set hidden diffopt-=hiddenoff | echo | silent execute 'bufdo diffthis' | 3b | execute 'tabdo windo diffthis' | tabfirst\""
576
577
EXPECTED_TARGET_01="MERGED"
578
EXPECTED_TARGET_02="LOCAL"
@@ -584,6 +590,9 @@ run_unit_tests () {
590
EXPECTED_TARGET_14="MERGED"
591
EXPECTED_TARGET_15="MERGED"
592
EXPECTED_TARGET_16="MERGED"
593
+ EXPECTED_TARGET_17="BASE"
594
+ EXPECTED_TARGET_18="REMOTE"
595
+ EXPECTED_TARGET_19="REMOTE"
596
597
at_least_one_ko="false"
598