Add nested variations of tests

Author: Vampire

test/svn-ignore.bats

@@ -25,6 +25,33 @@ load 'common'
     )"
 }
 
+@test 'svn:ignore entries should only ignore matching direct children (nested)' {
+    svn mkdir project-a
+    cd project-a
+    svn mkdir dir-a
+    svn commit -m 'add dir-a'
+    svn update
+    svn propset svn:ignore $'ignore-a\nignore-b' dir-a
+    svn commit -m 'ignore ignore-a and ignore-b on dir-a'
+
+    cd "$TEST_TEMP_DIR"
+    svn2git "$SVN_REPO" --svn-ignore --rules <(echo "
+        create repository git-repo
+        end repository
+
+        match /project-a/
+            repository git-repo
+            branch master
+        end match
+    ")
+
+    assert_equal "$(git -C git-repo show master:dir-a/.gitignore)" "$(cat <<-EOF
+			/ignore-a
+			/ignore-b
+		EOF
+    )"
+}
+
 @test 'svn:global-ignores entries should ignore all matching descendents' {
     svn mkdir dir-a
     svn commit -m 'add dir-a'
@@ -50,6 +77,33 @@ load 'common'
     )"
 }
 
+@test 'svn:global-ignores entries should ignore all matching descendents (nested)' {
+    svn mkdir project-a
+    cd project-a
+    svn mkdir dir-a
+    svn commit -m 'add dir-a'
+    svn update
+    svn propset svn:global-ignores $'ignore-a\nignore-b' dir-a
+    svn commit -m 'ignore ignore-a and ignore-b on dir-a and descendents'
+
+    cd "$TEST_TEMP_DIR"
+    svn2git "$SVN_REPO" --svn-ignore --rules <(echo "
+        create repository git-repo
+        end repository
+
+        match /project-a/
+            repository git-repo
+            branch master
+        end match
+    ")
+
+    assert_equal "$(git -C git-repo show master:dir-a/.gitignore)" "$(cat <<-EOF
+			ignore-a
+			ignore-b
+		EOF
+    )"
+}
+
 @test 'svn-ignore translation should be done if svn-branches parameter is used' {
     svn mkdir trunk
     svn commit -m 'create trunk'
@@ -95,6 +149,53 @@ load 'common'
     )"
 }
 
+@test 'svn-ignore translation should be done if svn-branches parameter is used (nested)' {
+    svn mkdir project-a
+    cd project-a
+    svn mkdir trunk
+    svn commit -m 'create trunk'
+    svn propset svn:ignore $'ignore-a\nignore-b' trunk
+    svn commit -m 'ignore ignore-a and ignore-b on root'
+    svn propset svn:global-ignores 'ignore-c' trunk
+    svn commit -m 'ignore ignore-c everywhere'
+    svn mkdir branches
+    svn copy trunk branches/branch-a
+    svn commit -m 'create branch branch-a'
+
+    cd "$TEST_TEMP_DIR"
+    svn2git "$SVN_REPO" --svn-ignore --svn-branches --rules <(echo "
+        create repository git-repo
+        end repository
+
+        match /project-a/trunk/
+            repository git-repo
+            branch master
+        end match
+
+        match /project-a/branches/([^/]+)/
+            repository git-repo
+            branch \1
+        end match
+
+        match /project-a/(branches/)?$
+            action recurse
+        end match
+    ")
+
+    assert_equal "$(git -C git-repo show master:.gitignore)" "$(cat <<-EOF
+			/ignore-a
+			/ignore-b
+			ignore-c
+		EOF
+    )"
+    assert_equal "$(git -C git-repo show branch-a:.gitignore)" "$(cat <<-EOF
+			/ignore-a
+			/ignore-b
+			ignore-c
+		EOF
+    )"
+}
+
 @test 'svn-ignore translation should be done transitively when copying a directory' {
     svn mkdir --parents dir-a/subdir-a
     svn commit -m 'add dir-a/subdir-a'
@@ -130,6 +231,43 @@ load 'common'
     )"
 }
 
+@test 'svn-ignore translation should be done transitively when copying a directory (nested)' {
+    svn mkdir project-a
+    cd project-a
+    svn mkdir --parents dir-a/subdir-a
+    svn commit -m 'add dir-a/subdir-a'
+    svn propset svn:ignore $'ignore-a\nignore-b' dir-a/subdir-a
+    svn commit -m 'ignore ignore-a and ignore-b on dir-a/subdir-a'
+    svn propset svn:global-ignores 'ignore-c' dir-a/subdir-a
+    svn commit -m 'ignore ignore-c on dir-a/subdir-a and descendents'
+    svn copy dir-a dir-b
+    svn commit -m 'copy dir-a to dir-b'
+
+    cd "$TEST_TEMP_DIR"
+    svn2git "$SVN_REPO" --svn-ignore --rules <(echo "
+        create repository git-repo
+        end repository
+
+        match /project-a/
+            repository git-repo
+            branch master
+        end match
+    ")
+
+    assert_equal "$(git -C git-repo show master:dir-a/subdir-a/.gitignore)" "$(cat <<-EOF
+			/ignore-a
+			/ignore-b
+			ignore-c
+		EOF
+    )"
+    assert_equal "$(git -C git-repo show master:dir-b/subdir-a/.gitignore)" "$(cat <<-EOF
+			/ignore-a
+			/ignore-b
+			ignore-c
+		EOF
+    )"
+}
+
 @test 'svn-ignore parameter should not cause added directories to be dumped multiple times' {
     svn mkdir dir-a
     echo content-a >dir-a/file-a