Replace managed tree indexer functionality with native libgit2 git_tree_frompath() invokation

nulltoken · nulltoken · commit 0200e5f65c09 · 2011-10-21T15:57:05.000+02:00
diff --git a/LibGit2Sharp.Tests/CommitFixture.cs b/LibGit2Sharp.Tests/CommitFixture.cs
@@ -391,7 +391,7 @@ public void CanReadCommitWithMultipleParents()
         }
 
         [Test]
-        public void CanDirectlyAccessFileOfTheCommit()
+        public void CanDirectlyAccessABlobOfTheCommit()
         {
             using (var repo = new Repository(Constants.BareTestRepoPath))
             {
@@ -404,6 +404,29 @@ public void CanDirectlyAccessFileOfTheCommit()
             }
         }
 
+        [Test]
+        public void CanDirectlyAccessATreeOfTheCommit()
+        {
+            using (var repo = new Repository(Constants.BareTestRepoPath))
+            {
+                var commit = repo.Lookup<Commit>("4c062a6");
+
+                var tree1 = commit["1"].Target as Tree;
+                tree1.ShouldNotBeNull();
+            }
+        }
+
+        [Test]
+        public void DirectlyAccessingAnUnknownTreeEntryOfTheCommitReturnsNull()
+        {
+            using (var repo = new Repository(Constants.BareTestRepoPath))
+            {
+                var commit = repo.Lookup<Commit>("4c062a6");
+
+                commit["I-am-not-here"].ShouldBeNull();
+            }
+        }
+
         [Test]
         public void CanCommitWithSignatureFromConfig()
         {
@@ -426,7 +449,7 @@ public void CanCommitWithSignatureFromConfig()
 
                 repo.Head[relativeFilepath].ShouldBeNull();
 
-                var commit = repo.Commit("Initial egotistic commit");
+                Commit commit = repo.Commit("Initial egotistic commit");
 
                 AssertBlobContent(repo.Head[relativeFilepath], "nulltoken\n");
                 AssertBlobContent(commit[relativeFilepath], "nulltoken\n");
@@ -440,7 +463,6 @@ public void CanCommitWithSignatureFromConfig()
             }
         }
 
-
         [Test]
         public void CanCommitALittleBit()
         {
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -399,5 +399,8 @@ public static extern IntPtr git_tree_entry_byname(
 
         [DllImport(libgit2)]
         public static extern uint git_tree_entrycount(IntPtr tree);
+
+        [DllImport(libgit2)]
+        public static extern int git_tree_frompath(out IntPtr tree, IntPtr root, string treeentry_path);
     }
 }
diff --git a/LibGit2Sharp/Tree.cs b/LibGit2Sharp/Tree.cs
@@ -32,30 +32,22 @@ public TreeEntry this[string relativePath]
 
         private TreeEntry RetrieveFromPath(string relativePath)
         {
-            string[] pathSegments = relativePath.Split('/');
+            Ensure.ArgumentNotNullOrEmptyString(relativePath, "relativePath");
 
-            Tree tree = this;
-
-            for (int i = 0; i < pathSegments.Length - 1; i++)
+            using (var obj = new ObjectSafeWrapper(Id, repo))
             {
-                TreeEntry entry = tree.RetrieveFromName(pathSegments[i]);
+                IntPtr objectPtr;
+
+                int res = NativeMethods.git_tree_frompath(out objectPtr, obj.ObjectPtr, relativePath);
 
-                if (entry == null || entry.Type != GitObjectType.Tree)
+                if (res == (int)GitErrorCode.GIT_ENOTFOUND)
                 {
                     return null;
                 }
 
-                tree = (Tree)entry.Target;
-            }
+                Ensure.Success(res);
 
-            return tree.RetrieveFromName(pathSegments[pathSegments.Length - 1]);
-        }
-
-        private TreeEntry RetrieveFromName(string entryName)
-        {
-            using (var obj = new ObjectSafeWrapper(Id, repo))
-            {
-                IntPtr e = NativeMethods.git_tree_entry_byname(obj.ObjectPtr, entryName);
+                IntPtr e = NativeMethods.git_tree_entry_byname(objectPtr, relativePath.Split('/').Last());
 
                 if (e == IntPtr.Zero)
                 {

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ public void CanReadCommitWithMultipleParents()`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`[Test]`
`394`		`- public void CanDirectlyAccessFileOfTheCommit()`
	`394`	`+ public void CanDirectlyAccessABlobOfTheCommit()`
`395`	`395`	`{`
`396`	`396`	`using (var repo = new Repository(Constants.BareTestRepoPath))`
`397`	`397`	`{`
`@@ -404,6 +404,29 @@ public void CanDirectlyAccessFileOfTheCommit()`
`404`	`404`	`}`
`405`	`405`	`}`
`406`	`406`
	`407`	`+ [Test]`
	`408`	`+ public void CanDirectlyAccessATreeOfTheCommit()`
	`409`	`+ {`
	`410`	`+ using (var repo = new Repository(Constants.BareTestRepoPath))`
	`411`	`+ {`
	`412`	`+ var commit = repo.Lookup<Commit>("4c062a6");`
	`413`	`+`
	`414`	`+ var tree1 = commit["1"].Target as Tree;`
	`415`	`+ tree1.ShouldNotBeNull();`
	`416`	`+ }`
	`417`	`+ }`
	`418`	`+`
	`419`	`+ [Test]`
	`420`	`+ public void DirectlyAccessingAnUnknownTreeEntryOfTheCommitReturnsNull()`
	`421`	`+ {`
	`422`	`+ using (var repo = new Repository(Constants.BareTestRepoPath))`
	`423`	`+ {`
	`424`	`+ var commit = repo.Lookup<Commit>("4c062a6");`
	`425`	`+`
	`426`	`+ commit["I-am-not-here"].ShouldBeNull();`
	`427`	`+ }`
	`428`	`+ }`
	`429`	`+`
`407`	`430`	`[Test]`
`408`	`431`	`public void CanCommitWithSignatureFromConfig()`
`409`	`432`	`{`
`@@ -426,7 +449,7 @@ public void CanCommitWithSignatureFromConfig()`
`426`	`449`
`427`	`450`	`repo.Head[relativeFilepath].ShouldBeNull();`
`428`	`451`
`429`		`- var commit = repo.Commit("Initial egotistic commit");`
	`452`	`+ Commit commit = repo.Commit("Initial egotistic commit");`
`430`	`453`
`431`	`454`	`AssertBlobContent(repo.Head[relativeFilepath], "nulltoken\n");`
`432`	`455`	`AssertBlobContent(commit[relativeFilepath], "nulltoken\n");`
`@@ -440,7 +463,6 @@ public void CanCommitWithSignatureFromConfig()`
`440`	`463`	`}`
`441`	`464`	`}`
`442`	`465`
`443`		`-`
`444`	`466`	`[Test]`
`445`	`467`	`public void CanCommitALittleBit()`
`446`	`468`	`{`
Original file line number	Diff line number	Diff line change
`@@ -399,5 +399,8 @@ public static extern IntPtr git_tree_entry_byname(`
`399`	`399`
`400`	`400`	`[DllImport(libgit2)]`
`401`	`401`	`public static extern uint git_tree_entrycount(IntPtr tree);`
	`402`	`+`
	`403`	`+ [DllImport(libgit2)]`
	`404`	`+ public static extern int git_tree_frompath(out IntPtr tree, IntPtr root, string treeentry_path);`
`402`	`405`	`}`
`403`	`406`	`}`