Teach repo.Ignore.IsPathIgnored() to cope with Windows directory separators

nulltoken · nulltoken · commit 5c99eeefdd32 · 2013-02-21T20:06:04.000+01:00
Fix libgit2#347
diff --git a/LibGit2Sharp.Tests/IgnoreFixture.cs b/LibGit2Sharp.Tests/IgnoreFixture.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
+using Xunit.Extensions;
 
 namespace LibGit2Sharp.Tests
 {
@@ -66,5 +67,22 @@ public void AddingATemporaryRuleWithBadParamsThrows()
                 Assert.Throws<ArgumentNullException>(() => repo.Ignore.AddTemporaryRules(null));
             }
         }
+
+        [Fact]
+        public void CanCheckIfAPathIsIgnoredUsingThePreferedPlatformDirectorySeparatorChar()
+        {
+            TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo(StandardTestRepoWorkingDirPath);
+
+            using (var repo = new Repository(path.RepositoryPath))
+            {
+                string ignorePath = Path.Combine(repo.Info.WorkingDirectory, ".gitignore");
+                File.WriteAllText(ignorePath, "/NewFolder\n/NewFolder/NewFolder");
+
+                Assert.False(repo.Ignore.IsPathIgnored("File.txt"));
+                Assert.True(repo.Ignore.IsPathIgnored("NewFolder"));
+                Assert.True(repo.Ignore.IsPathIgnored(string.Format(@"NewFolder{0}NewFolder", Path.DirectorySeparatorChar)));
+                Assert.True(repo.Ignore.IsPathIgnored(string.Format(@"NewFolder{0}NewFolder{0}File.txt", Path.DirectorySeparatorChar)));
+            }
+        }
     }
 }
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -403,7 +403,7 @@ internal static extern int git_ignore_add_rule(
         internal static extern int git_ignore_path_is_ignored(
             out int ignored,
             RepositorySafeHandle repo,
-            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof (Utf8Marshaler))] string path);
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(FilePathMarshaler))] FilePath path);
 
         [DllImport(libgit2)]
         internal static extern int git_index_add_bypath(

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using LibGit2Sharp.Tests.TestHelpers;`
`5`	`5`	`using Xunit;`
	`6`	`+using Xunit.Extensions;`
`6`	`7`
`7`	`8`	`namespace LibGit2Sharp.Tests`
`8`	`9`	`{`
`@@ -66,5 +67,22 @@ public void AddingATemporaryRuleWithBadParamsThrows()`
`66`	`67`	`Assert.Throws<ArgumentNullException>(() => repo.Ignore.AddTemporaryRules(null));`
`67`	`68`	`}`
`68`	`69`	`}`
	`70`	`+`
	`71`	`+ [Fact]`
	`72`	`+ public void CanCheckIfAPathIsIgnoredUsingThePreferedPlatformDirectorySeparatorChar()`
	`73`	`+ {`
	`74`	`+ TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo(StandardTestRepoWorkingDirPath);`
	`75`	`+`
	`76`	`+ using (var repo = new Repository(path.RepositoryPath))`
	`77`	`+ {`
	`78`	`+ string ignorePath = Path.Combine(repo.Info.WorkingDirectory, ".gitignore");`
	`79`	`+ File.WriteAllText(ignorePath, "/NewFolder\n/NewFolder/NewFolder");`
	`80`	`+`
	`81`	`+ Assert.False(repo.Ignore.IsPathIgnored("File.txt"));`
	`82`	`+ Assert.True(repo.Ignore.IsPathIgnored("NewFolder"));`
	`83`	`+ Assert.True(repo.Ignore.IsPathIgnored(string.Format(@"NewFolder{0}NewFolder", Path.DirectorySeparatorChar)));`
	`84`	`+ Assert.True(repo.Ignore.IsPathIgnored(string.Format(@"NewFolder{0}NewFolder{0}File.txt", Path.DirectorySeparatorChar)));`
	`85`	`+ }`
	`86`	`+ }`
`69`	`87`	`}`
`70`	`88`	`}`