git-p4: additional testing of --changes-block-size

Add additional tests of some corner-cases of the
--changes-block-size git-p4 parameter.

Also reduce the number of p4 changes created during the
tests, so that they complete faster.

Signed-off-by: Luke Diamand <luke@diamand.org>
Acked-by: Lex Spoon <lex@lexspoon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh
index 153b20afbd420f23e2379e2de1e3f4ea95eecd65..79765a4a4e120d921f764899887b1657ffe6569c 100755 (executable)
--- a/t/t9818-git-p4-block.sh
+++ b/t/t9818-git-p4-block.sh
@@ -8,18 +8,21 @@ test_expect_success 'start p4d' '
        start_p4d
 '
 
        start_p4d
 '
 

-test_expect_success 'Create a repo with ~100 changes' '
+test_expect_success 'Create a repo with many changes' '

        (
        (

-               cd "$cli" &&
+               client_view "//depot/included/... //client/included/..." \
+                           "//depot/excluded/... //client/excluded/..." &&
+               mkdir -p "$cli/included" "$cli/excluded" &&
+               cd "$cli/included" &&

                >file.txt &&
                p4 add file.txt &&
                p4 submit -d "Add file.txt" &&
                >file.txt &&
                p4 add file.txt &&
                p4 submit -d "Add file.txt" &&

-               for i in $(test_seq 0 9)
+               for i in $(test_seq 0 5)

                do
                        >outer$i.txt &&
                        p4 add outer$i.txt &&
                        p4 submit -d "Adding outer$i.txt" &&
                do
                        >outer$i.txt &&
                        p4 add outer$i.txt &&
                        p4 submit -d "Adding outer$i.txt" &&

-                       for j in $(test_seq 0 9)
+                       for j in $(test_seq 0 5)

                        do
                                p4 edit file.txt &&
                                echo $i$j >file.txt &&
                        do
                                p4 edit file.txt &&
                                echo $i$j >file.txt &&


@@ -30,33 +33,68 @@ test_expect_success 'Create a repo with ~100 changes' '
 '
 
 test_expect_success 'Clone the repo' '
 '
 
 test_expect_success 'Clone the repo' '

-       git p4 clone --dest="$git" --changes-block-size=10 --verbose //depot@all
+       git p4 clone --dest="$git" --changes-block-size=7 --verbose //depot/included@all

 '
 
 test_expect_success 'All files are present' '
        echo file.txt >expected &&
        test_write_lines outer0.txt outer1.txt outer2.txt outer3.txt outer4.txt >>expected &&
 '
 
 test_expect_success 'All files are present' '
        echo file.txt >expected &&
        test_write_lines outer0.txt outer1.txt outer2.txt outer3.txt outer4.txt >>expected &&

-       test_write_lines outer5.txt outer6.txt outer7.txt outer8.txt outer9.txt >>expected &&
+       test_write_lines outer5.txt >>expected &&

        ls "$git" >current &&
        test_cmp expected current
 '
 
 test_expect_success 'file.txt is correct' '
        ls "$git" >current &&
        test_cmp expected current
 '
 
 test_expect_success 'file.txt is correct' '

-       echo 99 >expected &&
+       echo 55 >expected &&

        test_cmp expected "$git/file.txt"
 '
 
 test_expect_success 'Correct number of commits' '
        (cd "$git" && git log --oneline) >log &&
        test_cmp expected "$git/file.txt"
 '
 
 test_expect_success 'Correct number of commits' '
        (cd "$git" && git log --oneline) >log &&

-       test_line_count = 111 log
+       wc -l log &&
+       test_line_count = 43 log

 '
 
 test_expect_success 'Previous version of file.txt is correct' '
        (cd "$git" && git checkout HEAD^^) &&
 '
 
 test_expect_success 'Previous version of file.txt is correct' '
        (cd "$git" && git checkout HEAD^^) &&

-       echo 97 >expected &&
+       echo 53 >expected &&

        test_cmp expected "$git/file.txt"
 '
 
        test_cmp expected "$git/file.txt"
 '
 

+# Test git-p4 sync, with some files outside the client specification.
+
+p4_add_file() {
+       (cd "$cli" &&
+               >$1 &&
+               p4 add $1 &&
+               p4 submit -d "Added a file" $1
+       )
+}
+
+test_expect_success 'Add some more files' '
+       for i in $(test_seq 0 10)
+       do
+               p4_add_file "included/x$i" &&
+               p4_add_file "excluded/x$i"
+       done &&
+       for i in $(test_seq 0 10)
+       do
+               p4_add_file "excluded/y$i"
+       done
+'
+
+# This should pick up the 10 new files in "included", but not be confused
+# by the additional files in "excluded"
+test_expect_success 'Syncing files' '
+       (
+               cd "$git" &&
+               git p4 sync --changes-block-size=7 &&
+               git checkout p4/master &&
+               ls -l x* > log &&
+               test_line_count = 11 log
+       )
+'
+

 test_expect_success 'kill p4d' '
        kill_p4d
 '
 test_expect_success 'kill p4d' '
        kill_p4d
 '