Fold ObjectDatabaseExtensions.cs into ObjectDatabase.cs

Author: nulltoken

LibGit2Sharp.Tests/ArchiveFixture.cs

@@ -68,8 +68,10 @@ public void ArchivingANullTreeOrCommitThrows()
             string path = SandboxBareTestRepo();
             using (var repo = new Repository(path))
             {
-                Assert.Throws<ArgumentNullException>(() => repo.ObjectDatabase.Archive((Commit)null, null));
-                Assert.Throws<ArgumentNullException>(() => repo.ObjectDatabase.Archive((Tree)null, null));
+                Assert.Throws<ArgumentNullException>(() => repo.ObjectDatabase.Archive(default(Commit), default(ArchiverBase)));
+                Assert.Throws<ArgumentNullException>(() => repo.ObjectDatabase.Archive(default(Commit), default(string)));
+                Assert.Throws<ArgumentNullException>(() => repo.ObjectDatabase.Archive(default(Tree), default(ArchiverBase)));
+                Assert.Throws<ArgumentNullException>(() => repo.ObjectDatabase.Archive(default(Tree), default(string)));
             }
         }
 

LibGit2Sharp/LibGit2Sharp.csproj

@@ -212,7 +212,6 @@
     <Compile Include="SubmoduleUpdate.cs" />
     <Compile Include="UnmergedIndexEntriesException.cs" />
     <Compile Include="Core\StringExtensions.cs" />
-    <Compile Include="ObjectDatabaseExtensions.cs" />
     <Compile Include="Commit.cs" />
     <Compile Include="CommitLog.cs" />
     <Compile Include="Configuration.cs" />

LibGit2Sharp/ObjectDatabase.cs

@@ -394,6 +394,34 @@ public virtual TagAnnotation CreateTagAnnotation(string name, GitObject target,
             return repo.Lookup<TagAnnotation>(tagId);
         }
 
+        /// <summary>
+        /// Create a TAR archive of the given tree.
+        /// </summary>
+        /// <param name="tree">The tree.</param>
+        /// <param name="archivePath">The archive path.</param>
+        public virtual void Archive(Tree tree, string archivePath)
+        {
+            using (var output = new FileStream(archivePath, FileMode.Create))
+            using (var archiver = new TarArchiver(output))
+            {
+                Archive(tree, archiver);
+            }
+        }
+
+        /// <summary>
+        /// Create a TAR archive of the given commit.
+        /// </summary>
+        /// <param name="commit">commit.</param>
+        /// <param name="archivePath">The archive path.</param>
+        public virtual void Archive(Commit commit, string archivePath)
+        {
+            using (var output = new FileStream(archivePath, FileMode.Create))
+            using (var archiver = new TarArchiver(output))
+            {
+                Archive(commit, archiver);
+            }
+        }
+
         /// <summary>
         /// Archive the given commit.
         /// </summary>