Delegate the enumerating of branches to libgit2 native methods

nulltoken · nulltoken · commit e8fe68a894d6 · 2012-05-20T11:00:12.000+02:00
diff --git a/LibGit2Sharp/BranchCollection.cs b/LibGit2Sharp/BranchCollection.cs
@@ -45,8 +45,8 @@ public Branch this[string name]
         /// <returns>An <see cref = "IEnumerator{T}" /> object that can be used to iterate through the collection.</returns>
         public IEnumerator<Branch> GetEnumerator()
         {
-            return Libgit2UnsafeHelper.ListAllReferenceNames(repo.Handle, GitReferenceType.ListAll)
-                .Where(LooksLikeABranchName)
+            return Libgit2UnsafeHelper
+                .ListAllBranchNames(repo.Handle, GitBranchType.GIT_BRANCH_LOCAL | GitBranchType.GIT_BRANCH_REMOTE)
                 .Select(n => this[n])
                 .GetEnumerator();
         }
diff --git a/LibGit2Sharp/Core/Libgit2UnsafeHelper.cs b/LibGit2Sharp/Core/Libgit2UnsafeHelper.cs
@@ -8,6 +8,15 @@ internal static unsafe class Libgit2UnsafeHelper
     {
         private static readonly Utf8Marshaler marshaler = (Utf8Marshaler)Utf8Marshaler.GetInstance(string.Empty);
 
+        public static IList<string> ListAllBranchNames(RepositorySafeHandle repo, GitBranchType types)
+        {
+            UnSafeNativeMethods.git_strarray strArray;
+            int res = UnSafeNativeMethods.git_branch_list(out strArray, repo, types);
+            Ensure.Success(res);
+
+            return BuildListOf(strArray);
+        }
+
         public static IList<string> ListAllReferenceNames(RepositorySafeHandle repo, GitReferenceType types)
         {
             UnSafeNativeMethods.git_strarray strArray;
diff --git a/LibGit2Sharp/Core/UnSafeNativeMethods.cs b/LibGit2Sharp/Core/UnSafeNativeMethods.cs
@@ -8,6 +8,9 @@ internal static unsafe class UnSafeNativeMethods
     {
         private const string libgit2 = "git2";
 
+        [DllImport(libgit2)]
+        public static extern int git_branch_list(out git_strarray array, RepositorySafeHandle repo, GitBranchType flags);
+
         [DllImport(libgit2)]
         public static extern int git_reference_list(out git_strarray array, RepositorySafeHandle repo, GitReferenceType flags);
 

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ public Branch this[string name]`
`45`	`45`	`/// <returns>An <see cref = "IEnumerator{T}" /> object that can be used to iterate through the collection.</returns>`
`46`	`46`	`public IEnumerator<Branch> GetEnumerator()`
`47`	`47`	`{`
`48`		`- return Libgit2UnsafeHelper.ListAllReferenceNames(repo.Handle, GitReferenceType.ListAll)`
`49`		`- .Where(LooksLikeABranchName)`
	`48`	`+ return Libgit2UnsafeHelper`
	`49`	`+ .ListAllBranchNames(repo.Handle, GitBranchType.GIT_BRANCH_LOCAL \| GitBranchType.GIT_BRANCH_REMOTE)`
`50`	`50`	`.Select(n => this[n])`
`51`	`51`	`.GetEnumerator();`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@ internal static unsafe class UnSafeNativeMethods`
`8`	`8`	`{`
`9`	`9`	`private const string libgit2 = "git2";`
`10`	`10`
	`11`	`+ [DllImport(libgit2)]`
	`12`	`+ public static extern int git_branch_list(out git_strarray array, RepositorySafeHandle repo, GitBranchType flags);`
	`13`	`+`
`11`	`14`	`[DllImport(libgit2)]`
`12`	`15`	`public static extern int git_reference_list(out git_strarray array, RepositorySafeHandle repo, GitReferenceType flags);`
`13`	`16`