Merge remote-tracking branch 'elego/plastic' into plastic

These commits were forgotten before merging pack-protocol.

Author: carlosmn

LibGit2Sharp.Tests/ObjectDatabaseFixture.cs

@@ -270,6 +270,7 @@ public void CanListAllObjectsFromDatabase(string id)
             objects.Contains(new ObjectId(id));
         }
 
+        [Fact]
         public void CanListAllCommitsFromDatabase()
         {
             TemporaryCloneOfTestRepo scd = BuildTemporaryCloneOfTestRepo();

LibGit2Sharp/Indexer.cs

@@ -41,16 +41,17 @@ public void IndexStream(Stream stream)
         {
             byte[] buffer = new byte[4096];
             int read;
-            var stats = Marshal.AllocHGlobal(Marshal.SizeOf(Stats));
-            do {
-                read = stream.Read(buffer, 0, buffer.Length);
-                Ensure.Success(NativeMethods.git_indexer_stream_add(handle, buffer, new UIntPtr((ulong)read), stats));
-                Stats = (IndexerStats)Marshal.PtrToStructure(stats, typeof(IndexerStats));
-            } while(read > 0);
-            Ensure.Success(NativeMethods.git_indexer_stream_finalize(handle, stats));
-            Stats = (IndexerStats)Marshal.PtrToStructure(stats, typeof(IndexerStats));
-
-            Marshal.FreeHGlobal(stats);
+            unsafe {
+                var stats = stackalloc byte[Marshal.SizeOf(Stats)];
+                var statsptr = new IntPtr(stats);
+                do {
+                    read = stream.Read(buffer, 0, buffer.Length);
+                    Ensure.Success(NativeMethods.git_indexer_stream_add(handle, buffer, new UIntPtr((ulong)read), statsptr));
+                    Stats = (IndexerStats)Marshal.PtrToStructure(statsptr, typeof(IndexerStats));
+                } while(read > 0);
+                Ensure.Success(NativeMethods.git_indexer_stream_finalize(handle, statsptr));
+                Stats = (IndexerStats)Marshal.PtrToStructure(statsptr, typeof(IndexerStats));
+            }
         }
 
         public ObjectId Hash()

LibGit2Sharp/ObjectDatabase.cs

@@ -15,7 +15,7 @@ public class ObjectDatabase
     {
         private readonly Repository repo;
         private readonly ObjectDatabaseSafeHandle handle;
-        private List<ObjectId> objects = new List<ObjectId>();
+        private List<ObjectId> objects = null;
 
         public Diff Diff
         {
@@ -44,6 +44,8 @@ internal ObjectDatabase(Repository repo)
         internal ObjectDatabase(ObjectDatabaseSafeHandle handle)
         {
             this.handle = handle;
+            this.repo = new Repository(this);
+            repo.RegisterForCleanup(handle);
         }
 
         internal ObjectDatabaseSafeHandle Handle
@@ -65,6 +67,10 @@ private int ForeachCallback(ref GitOid oid, IntPtr data)
         /// </returns>
         public List<ObjectId> AllObjects()
         {
+            if (objects != null)
+                return objects;
+
+            objects = new List<ObjectId>();
             Ensure.Success(NativeMethods.git_odb_foreach(handle, ForeachCallback, IntPtr.Zero));
             return objects;
         }
@@ -168,43 +174,15 @@ internal Commit CreateCommit(string message, Signature author, Signature committ
             return repo.Lookup<Commit>(new ObjectId(commitOid));
         }
 
-        internal GitObject LookupInternal(ObjectId id, GitObjectType type, FilePath knownPath)
+        /// <summary>
+        ///   Try to lookup an object by its sha or a reference canonical name and <see cref = "GitObjectType" />. If no matching object is found, null will be returned.
+        /// </summary>
+        /// <param name = "shaOrReferenceName">The sha or reference canonical name to lookup.</param>
+        /// <param name = "type">The kind of <see cref = "GitObject" /> being looked up</param>
+        /// <returns>The <see cref = "GitObject" /> or null if it was not found.</returns>
+        public GitObject Lookup(string shaOrReferenceName, GitObjectType type = GitObjectType.Any)
         {
-            Ensure.ArgumentNotNull(id, "id");
-
-            GitOid oid = id.Oid;
-            GitObjectSafeHandle obj = null;
-
-            try
-            {
-                int res;
-                if (id is AbbreviatedObjectId)
-                {
-                    res = NativeMethods.git_object_lookup_prefix_odb(out obj, handle, ref oid, (uint)((AbbreviatedObjectId)id).Length, type);
-                }
-                else
-                {
-                    res = NativeMethods.git_object_lookup_odb(out obj, handle, ref oid, type);
-                }
-
-                if (res == (int)GitErrorCode.GIT_ENOTFOUND)
-                {
-                    return null;
-                }
-
-                Ensure.Success(res);
-
-                if (id is AbbreviatedObjectId)
-                {
-                    id = GitObject.ObjectIdOf(obj);
-                }
-
-                return GitObject.CreateFromPtr(obj, id, this, knownPath);
-            }
-            finally
-            {
-                obj.SafeDispose();
-            }
+            return repo.Lookup(shaOrReferenceName, type, LookUpOptions.None);
         }
 
         /// <summary>
@@ -215,12 +193,12 @@ internal GitObject LookupInternal(ObjectId id, GitObjectType type, FilePath know
         /// <returns>The <see cref = "GitObject" /> or null if it was not found.</returns>
         public GitObject Lookup(ObjectId id, GitObjectType type = GitObjectType.Any)
         {
-            return LookupInternal(id, type, null);
+            return repo.Lookup(id, type);
         }
 
         internal GitObject LookupTreeEntryTarget(ObjectId id, FilePath path)
         {
-            return LookupInternal(id, GitObjectType.Any, path);
+            return repo.LookupTreeEntryTarget(id, path);
         }
 
     }

LibGit2Sharp/ObjectDatabaseExtensions.cs

@@ -3,11 +3,23 @@ namespace LibGit2Sharp
 {
     public static class ObjectDatabaseExtensions
     {
+        /// <summary>
+        ///   Try to lookup an object by its sha or a reference name.
+        /// </summary>
+        /// <typeparam name = "T"></typeparam>
+        /// <param name = "odb">The <see cref = "ObjectDatabase" /> being looked up.</param>
+        /// <param name = "shaOrRef">The shaOrRef to lookup.</param>
+        /// <returns></returns>
+        public static T Lookup<T>(this ObjectDatabase odb, string shaOrRef) where T : GitObject
+        {
+            return (T)odb.Lookup(shaOrRef, GitObject.TypeToTypeMap[typeof(T)]);
+        }
+
         /// <summary>
         ///   Try to lookup an object by its <see cref = "ObjectId" />.
         /// </summary>
         /// <typeparam name = "T"></typeparam>
-        /// <param name = "repository">The <see cref = "Repository" /> being looked up.</param>
+        /// <param name = "odb">The <see cref = "ObjectDatabase" /> being looked up.</param>
         /// <param name = "id">The id.</param>
         /// <returns></returns>
         public static T Lookup<T>(this ObjectDatabase odb, ObjectId id) where T : GitObject