Add support of the Mixed mode to Repository.Reset()

nulltoken · nulltoken · commit d4b3d9d08950 · 2012-01-08T21:54:34.000+01:00
diff --git a/LibGit2Sharp.Tests/ResetFixture.cs b/LibGit2Sharp.Tests/ResetFixture.cs
@@ -127,5 +127,32 @@ private static void FeedTheRepository(Repository repo)
 
             repo.Index.RetrieveStatus().IsDirty.ShouldBeFalse();
         }
+
+        [Test]
+        public void MixedResetRefreshesTheIndex()
+        {
+            SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
+            string dir = Repository.Init(scd.DirectoryPath);
+
+            using (var repo = new Repository(dir))
+            {
+                FeedTheRepository(repo);
+
+                Tag tag = repo.Tags["mytag"];
+
+                repo.Reset(ResetOptions.Mixed, tag.CanonicalName);
+
+                repo.Index.RetrieveStatus("a.txt").ShouldEqual(FileStatus.Modified);
+            }
+        }
+
+        [Test]
+        public void MixedResetInABareRepositoryThrows()
+        {
+            using (var repo = new Repository(BareTestRepoPath))
+            {
+                Assert.Throws<LibGit2Exception>(() => repo.Reset(ResetOptions.Mixed, repo.Head.Tip.Sha));
+            }
+        }
     }
 }
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -155,6 +155,9 @@ public static extern int git_index_find(
         [DllImport(libgit2)]
         public static extern IntPtr git_index_get(IndexSafeHandle index, uint n);
 
+        [DllImport(libgit2)]
+        public static extern int git_index_read_tree(IndexSafeHandle index, IntPtr tree);
+
         [DllImport(libgit2)]
         public static extern int git_index_remove(IndexSafeHandle index, int n);
 
diff --git a/LibGit2Sharp/Index.cs b/LibGit2Sharp/Index.cs
@@ -523,5 +523,15 @@ public RepositoryStatus RetrieveStatus()
         {
             return new RepositoryStatus(repo);
         }
+
+        internal void ReplaceContentWithTree(Tree tree)
+        {
+            using (var nativeTree = new ObjectSafeWrapper(tree.Id, repo))
+            {
+                int res = NativeMethods.git_index_read_tree(Handle, nativeTree.ObjectPtr);
+                Ensure.Success(res);
+                UpdatePhysicalIndex();
+            }
+        }
     }
 }
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -305,6 +305,11 @@ public void Reset(ResetOptions resetOptions, string shaOrReferenceName)
         {
             Ensure.ArgumentNotNullOrEmptyString(shaOrReferenceName, "shaOrReferenceName");
 
+            if (resetOptions.Has(ResetOptions.Mixed) && Info.IsBare)
+            {
+                throw new LibGit2Exception("Mixed reset is not allowed in a bare repository");
+            }
+
             GitObject commit = Lookup(shaOrReferenceName, GitObjectType.Any, LookUpOptions.ThrowWhenNoGitObjectHasBeenFound | LookUpOptions.DereferenceResultToCommit | LookUpOptions.ThrowWhenCanNotBeDereferencedToACommit);
 
             //TODO: Check for unmerged entries
@@ -317,6 +322,13 @@ public void Reset(ResetOptions resetOptions, string shaOrReferenceName)
                 return;
             }
 
+            Index.ReplaceContentWithTree(((Commit)commit).Tree);
+
+            if (resetOptions == ResetOptions.Mixed)
+            {
+                return;
+            }
+
             throw new NotImplementedException();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -523,5 +523,15 @@ public RepositoryStatus RetrieveStatus()`
`523`	`523`	`{`
`524`	`524`	`return new RepositoryStatus(repo);`
`525`	`525`	`}`
	`526`	`+`
	`527`	`+ internal void ReplaceContentWithTree(Tree tree)`
	`528`	`+ {`
	`529`	`+ using (var nativeTree = new ObjectSafeWrapper(tree.Id, repo))`
	`530`	`+ {`
	`531`	`+ int res = NativeMethods.git_index_read_tree(Handle, nativeTree.ObjectPtr);`
	`532`	`+ Ensure.Success(res);`
	`533`	`+ UpdatePhysicalIndex();`
	`534`	`+ }`
	`535`	`+ }`
`526`	`536`	`}`
`527`	`537`	`}`
Original file line number	Diff line number	Diff line change
`@@ -305,6 +305,11 @@ public void Reset(ResetOptions resetOptions, string shaOrReferenceName)`
`305`	`305`	`{`
`306`	`306`	`Ensure.ArgumentNotNullOrEmptyString(shaOrReferenceName, "shaOrReferenceName");`
`307`	`307`
	`308`	`+ if (resetOptions.Has(ResetOptions.Mixed) && Info.IsBare)`
	`309`	`+ {`
	`310`	`+ throw new LibGit2Exception("Mixed reset is not allowed in a bare repository");`
	`311`	`+ }`
	`312`	`+`
`308`	`313`	`GitObject commit = Lookup(shaOrReferenceName, GitObjectType.Any, LookUpOptions.ThrowWhenNoGitObjectHasBeenFound \| LookUpOptions.DereferenceResultToCommit \| LookUpOptions.ThrowWhenCanNotBeDereferencedToACommit);`
`309`	`314`
`310`	`315`	`//TODO: Check for unmerged entries`
`@@ -317,6 +322,13 @@ public void Reset(ResetOptions resetOptions, string shaOrReferenceName)`
`317`	`322`	`return;`
`318`	`323`	`}`
`319`	`324`
	`325`	`+ Index.ReplaceContentWithTree(((Commit)commit).Tree);`
	`326`	`+`
	`327`	`+ if (resetOptions == ResetOptions.Mixed)`
	`328`	`+ {`
	`329`	`+ return;`
	`330`	`+ }`
	`331`	`+`
`320`	`332`	`throw new NotImplementedException();`
`321`	`333`	`}`
`322`	`334`	`}`